238 files changed, 3537 insertions, 619 deletions

diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt
index 4bebb76d7..c9f90de6a 100644
--- a/hicn-light/CMakeLists.txt
+++ b/hicn-light/CMakeLists.txt
@@ -98,4 +98,4 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
 	message(STATUS "Set \"-undefined dynamic_lookup\" for shared libraries")
 endif()
 
-add_subdirectory(src)
\ No newline at end of file
+add_subdirectory(src/hicn)
\ No newline at end of file
diff --git a/hicn-light/src/CMakeLists.txt b/hicn-light/src/hicn/CMakeLists.txt
index c7a4b5efd..2130c1c39 100644
--- a/hicn-light/src/CMakeLists.txt
+++ b/hicn-light/src/hicn/CMakeLists.txt
@@ -10,6 +10,7 @@ endif ()
 add_subdirectory(config)
 add_subdirectory(content_store)
 add_subdirectory(core)
+add_subdirectory(api)
 add_subdirectory(io)
 add_subdirectory(messenger)
 add_subdirectory(platforms)
@@ -47,3 +48,4 @@ build_library(${LIBHICN_LIGHT}
   INSTALL_ROOT_DIR hicn/light
   DEFINITIONS ${COMPILER_DEFINITIONS}
 )
+
diff --git a/hicn-light/src/hicn/api/CMakeLists.txt b/hicn-light/src/hicn/api/CMakeLists.txt
new file mode 100644
index 000000000..c8bf16ff3
--- /dev/null
+++ b/hicn-light/src/hicn/api/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Copyright (c) 2017-2019 Cisco and/or its affiliates.
+# 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.
+
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+
+set(HEADER_FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/api.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/commands.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/face.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/ip_address.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/token.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/types.h
+)
+
+set(SOURCE_FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/api.c
+)
+
+build_library(hicn-light-ctrl
+  SHARED
+  SOURCES ${SOURCE_FILES}
+  COMPONENT ${HICN_LIGHT}
+  INSTALL_ROOT_DIR hicn
+  INSTALL_HEADERS  ${HEADER_FILES}
+  LINK_LIBRARIES ${HICN_LIGHT_LINK_LIBRARIES}
+)
\ No newline at end of file
diff --git a/hicn-light/src/hicn/api/api.c b/hicn-light/src/hicn/api/api.c
new file mode 100644
index 000000000..291f3e6a3
--- /dev/null
+++ b/hicn-light/src/hicn/api/api.c
@@ -0,0 +1,1391 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+/**
+ * \file api.c
+ * \brief Implementation of hICN control library API
+ */
+
+#include <assert.h>      // assert
+#include <fcntl.h>       // fcntl
+#include <math.h>        // log2
+#include <string.h>      // memmove, strncpy, strcasecmp
+#include <sys/socket.h>  // socket
+#include <unistd.h>      // close, fcntl
+
+#include <stdio.h>  // XXX debug
+
+#include <hicn/api/api.h>
+#include <hicn/api/commands.h>
+#include <hicn/api/ip_address.h>
+#include <hicn/api/token.h>
+
+#define PORT 9695
+
+#define LIBHICNCTRL_SUCCESS 1
+#define LIBHICNCTRL_FAILURE -1
+#define LIBHICNCTRL_IS_ERROR(x) (x < 0)
+
+/*
+ * list was working with all seq set to 0, but it seems hicnLightControl uses
+ * 1, and replies with the same seqno
+ */
+#define HICN_CTRL_SEND_SEQ_INIT 1
+#define HICN_CTRL_RECV_SEQ_INIT 1
+
+#define MAX(x, y) ((x > y) ? x : y)
+
+#if 0
+static inline u32 log2(const u32 x) {
+  u32 y;
+  asm ( "\tbsr %1, %0\n"
+      : "=r"(y)
+      : "r" (x)
+  );
+  return y;
+}
+#endif
+
+/**
+ * \brief Defines the default size for the allocated data arrays holding the
+ * results of API calls.
+ *
+ * This size should not be too small to avoid wasting memoyy, but also not too
+ * big to avoid unnecessary realloc's. Later on this size is doubled at each
+ * reallocation.
+ */
+#define DEFAULT_SIZE_LOG 3
+
+/**
+ * In practise, we want to preserve enough room to store a full packet of
+ * average expected size (say a header + N payload elements).
+ */
+#define AVG_ELEMENTS (1 << DEFAULT_SIZE_LOG)
+#define AVG_BUFLEN \
+  sizeof(hc_msg_header_t) + AVG_ELEMENTS * sizeof(hc_msg_payload_t)
+
+/*
+ * We should at least have buffer space allowing to store one processable unit
+ * of data, either the header of the maximum possible payload
+ */
+#define MIN_BUFLEN MAX(sizeof(hc_msg_header_t), sizeof(hc_msg_payload_t))
+
+static const struct in6_addr loopback_addr = IN6ADDR_LOOPBACK_INIT;
+
+/* /!\ Please update constants in header file upon changes */
+const char *connection_type_str[] = {
+#define _(x) [CONNECTION_TYPE_##x] = STRINGIZE(x),
+    foreach_connection_type
+#undef _
+};
+
+#define IS_VALID_CONNECTION_TYPE(x) IS_VALID_ENUM_TYPE(CONNECTION_TYPE, x)
+
+hc_connection_type_t connection_type_from_str(const char *str) {
+  if (strcasecmp(str, "TCP") == 0)
+    return CONNECTION_TYPE_TCP;
+  else if (strcasecmp(str, "UDP") == 0)
+    return CONNECTION_TYPE_UDP;
+  else if (strcasecmp(str, "HICN") == 0)
+    return CONNECTION_TYPE_HICN;
+  else
+    return CONNECTION_TYPE_UNDEFINED;
+}
+
+/*
+ * Mandatory conversions to shield lib user from heterogeneity
+ */
+
+#define IS_VALID_LIST_CONNECTIONS_TYPE(x) ((x >= CONN_GRE) && (x <= CONN_HICN))
+
+static const hc_connection_type_t map_from_list_connections_type[] = {
+    [CONN_GRE] = CONNECTION_TYPE_UNDEFINED,
+    [CONN_TCP] = CONNECTION_TYPE_TCP,
+    [CONN_UDP] = CONNECTION_TYPE_UDP,
+    [CONN_MULTICAST] = CONNECTION_TYPE_UNDEFINED,
+    [CONN_L2] = CONNECTION_TYPE_UNDEFINED,
+    [CONN_HICN] = CONNECTION_TYPE_HICN,
+};
+
+typedef enum {
+  ENCAP_TCP,
+  ENCAP_UDP,
+  ENCAP_ETHER,
+  ENCAP_LOCAL,
+  ENCAP_HICN
+} EncapType;
+
+#define IS_VALID_LIST_LISTENERS_TYPE(x) ((x >= ENCAP_TCP) && (x <= ENCAP_HICN))
+
+static const hc_connection_type_t map_from_encap_type[] = {
+    [ENCAP_TCP] = CONNECTION_TYPE_TCP,
+    [ENCAP_UDP] = CONNECTION_TYPE_UDP,
+    [ENCAP_ETHER] = CONNECTION_TYPE_UNDEFINED,
+    [ENCAP_LOCAL] = CONNECTION_TYPE_UNDEFINED,
+    [ENCAP_HICN] = CONNECTION_TYPE_HICN,
+};
+
+static const connection_type map_to_connection_type[] = {
+    [CONNECTION_TYPE_TCP] = TCP_CONN,
+    [CONNECTION_TYPE_UDP] = UDP_CONN,
+    [CONNECTION_TYPE_HICN] = HICN_CONN,
+};
+
+static const listener_mode map_to_listener_mode[] = {
+    [CONNECTION_TYPE_TCP] = IP_MODE,
+    [CONNECTION_TYPE_UDP] = IP_MODE,
+    [CONNECTION_TYPE_HICN] = HICN_MODE,
+};
+
+#define IS_VALID_LIST_CONNECTIONS_STATE(x) \
+  ((x >= IFACE_UP) && (x <= IFACE_UNKNOWN))
+
+/* /!\ Please update constants in header file upon changes */
+const char *connection_state_str[] = {
+#define _(x) [CONNECTION_STATE_##x] = STRINGIZE(x),
+    foreach_connection_state
+#undef _
+};
+
+/*
+#define IS_VALID_CONNECTION_STATE(x) IS_VALID_ENUM_TYPE(CONNECTION_STATE, x)
+
+static const connection_state map_to_connection_state[] = {
+    [CONNECTION_STATE_UP]       = IFACE_UP,
+    [CONNECTION_STATE_DOWN]     = IFACE_DOWN,
+};
+
+*/
+
+static const hc_connection_state_t map_from_list_connections_state[] = {
+    [IFACE_UP] = CONNECTION_STATE_UP,
+    [IFACE_DOWN] = CONNECTION_STATE_DOWN,
+    [IFACE_UNKNOWN] = CONNECTION_STATE_UNDEFINED,
+};
+
+#define IS_VALID_ADDR_TYPE(x) ((x >= ADDR_INET) && (x <= ADDR_UNIX))
+
+static const int map_from_addr_type[] = {
+    [ADDR_INET] = AF_INET,    [ADDR_INET6] = AF_INET6, [ADDR_LINK] = AF_UNSPEC,
+    [ADDR_IFACE] = AF_UNSPEC, [ADDR_UNIX] = AF_UNSPEC,
+};
+
+static const address_type map_to_addr_type[] = {
+    [AF_INET] = ADDR_INET,
+    [AF_INET6] = ADDR_INET6,
+};
+
+/******************************************************************************
+ * Message helper types and aliases
+ ******************************************************************************/
+
+#define foreach_hc_command \
+  _(add_listener)          \
+  _(add_connection)        \
+  _(list_connections)      \
+  _(add_route)             \
+  _(list_routes)           \
+  _(remove_connection)     \
+  _(remove_route)          \
+  _(cache_store)           \
+  _(cache_serve)           \
+  /*_(cache_clear) */      \
+  _(set_strategy)          \
+  _(set_wldr)              \
+  _(add_punting)           \
+  _(list_listeners)        \
+  _(mapme_activator)       \
+  _(mapme_timing)
+
+typedef header_control_message hc_msg_header_t;
+
+typedef union {
+#define _(x) x##_command x;
+  foreach_hc_command
+#undef _
+} hc_msg_payload_t;
+
+typedef struct hc_msg_s {
+  hc_msg_header_t hdr;
+  hc_msg_payload_t payload;
+} hc_msg_t;
+
+/******************************************************************************
+ * Control Data
+ ******************************************************************************/
+
+hc_data_t *hc_data_create(size_t in_element_size, size_t out_element_size) {
+  hc_data_t *data = malloc(sizeof(hc_data_t));
+  if (!data) goto ERR_MALLOC;
+
+  /* FIXME Could be NULL thanks to realloc provided size is 0 */
+  data->max_size_log = DEFAULT_SIZE_LOG;
+  data->in_element_size = in_element_size;
+  data->out_element_size = out_element_size;
+  data->size = 0;
+  data->complete = 0;
+  data->command_id = 0;  // TODO this could also be a busy mark in the socket
+  /* No callback needed in blocking code for instance */
+  data->complete_cb = NULL;
+
+  data->buffer = malloc((1 << data->max_size_log) * data->out_element_size);
+  if (!data->buffer) goto ERR_BUFFER;
+
+  return data;
+
+ERR_BUFFER:
+  free(data);
+ERR_MALLOC:
+  return NULL;
+}
+
+void hc_data_free(hc_data_t *data) {
+  if (data->buffer) free(data->buffer);
+  free(data);
+}
+
+int hc_data_ensure_available(hc_data_t *data, size_t count) {
+  size_t new_size_log =
+      (data->size + count - 1 > 0) ? log2(data->size + count - 1) + 1 : 0;
+  if (new_size_log > data->max_size_log) {
+    data->max_size_log = new_size_log;
+    data->buffer =
+        realloc(data->buffer, (1 << new_size_log) * data->out_element_size);
+    if (!data->buffer) return LIBHICNCTRL_FAILURE;
+  }
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_data_push_many(hc_data_t *data, const void *elements, size_t count) {
+  if (hc_data_ensure_available(data, count) < 0) return LIBHICNCTRL_FAILURE;
+
+  memcpy(data->buffer + data->size * data->out_element_size, elements,
+         count * data->out_element_size);
+  data->size += count;
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_data_push(hc_data_t *data, const void *element) {
+  return hc_data_push_many(data, element, 1);
+}
+
+/**
+ *
+ * NOTE: This function make sure there is enough room available in the data
+ * structure.
+ */
+u8 *hc_data_get_next(hc_data_t *data) {
+  if (hc_data_ensure_available(data, 1) < 0) return NULL;
+
+  return data->buffer + data->size * data->out_element_size;
+}
+
+int hc_data_set_callback(hc_data_t *data, data_callback_t cb, void *cb_data) {
+  data->complete_cb = cb;
+  data->complete_cb_data = cb_data;
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_data_set_complete(hc_data_t *data) {
+  data->complete = true;
+  if (data->complete_cb) return data->complete_cb(data, data->complete_cb_data);
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_data_reset(hc_data_t *data) {
+  data->size = 0;
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_data_find(hc_data_t *data, const void *element, cmp_t cmp,
+                 void **found) {
+  foreach_type(u8, x, data) {
+    if (cmp(x, element) == 0) {
+      *found = x;
+      return LIBHICNCTRL_SUCCESS;
+    }
+  };
+  *found = NULL; /* this is optional */
+  return LIBHICNCTRL_SUCCESS;
+}
+
+/******************************************************************************
+ * Control socket
+ ******************************************************************************/
+
+/**
+ * \brief Parse a connection URL into a sockaddr
+ * \param [in] url - URL
+ * \param [out] sa - Resulting struct sockaddr, expected zero'ed.
+ * \return 0 if parsing succeeded, a negative error value otherwise.
+ */
+int hc_sock_parse_url(const char *url, struct sockaddr *sa) {
+  /* FIXME URL parsing is currently not implemented */
+  assert(!url);
+
+  /*
+   * A temporary solution is to inspect the sa_family fields of the passed in
+   * sockaddr, which defaults to AF_UNSPEC (0) and thus creates an IPv4/TCP
+   * connection to localhost.
+   */
+  switch (sa->sa_family) {
+    case AF_UNSPEC:
+    case AF_INET: {
+      struct sockaddr_in *sai = (struct sockaddr_in *)sa;
+      sai->sin_family = AF_INET;
+      sai->sin_port = htons(PORT);
+      sai->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+      break;
+    }
+    case AF_INET6: {
+      struct sockaddr_in6 *sai6 = (struct sockaddr_in6 *)sa;
+      sai6->sin6_family = AF_INET6;
+      sai6->sin6_port = htons(PORT);
+      sai6->sin6_addr = loopback_addr;
+      break;
+    }
+    default:
+      return LIBHICNCTRL_FAILURE;
+  }
+
+  return LIBHICNCTRL_SUCCESS;
+}
+
+hc_sock_t *hc_sock_create_url(const char *url) {
+  hc_sock_t *s = malloc(sizeof(hc_sock_t));
+  if (!s) goto ERR_MALLOC;
+
+  s->url = url ? strdup(url) : NULL;
+
+  s->fd = socket(AF_INET, SOCK_STREAM, 0);
+  if (s->fd < 0) goto ERR_SOCKET;
+
+  if (hc_sock_reset(s) < 0) goto ERR_RESET;
+
+  return s;
+
+ERR_RESET:
+  close(s->fd);
+ERR_SOCKET:
+  free(s);
+ERR_MALLOC:
+  return NULL;
+}
+
+hc_sock_t *hc_sock_create(void) { return hc_sock_create_url(NULL); }
+
+void hc_sock_free(hc_sock_t *s) {
+  if (s->url) free(s->url);
+  close(s->fd);
+  free(s);
+}
+
+int hc_sock_set_nonblocking(hc_sock_t *s) {
+  return (fcntl(s->fd, F_SETFL, fcntl(s->fd, F_GETFL) | O_NONBLOCK) < 0);
+}
+
+int hc_sock_connect(hc_sock_t *s) {
+  struct sockaddr_storage ss = {0};
+
+  if (hc_sock_parse_url(s->url, (struct sockaddr *)&ss) < 0) goto ERR_PARSE;
+
+  size_t size = ss.ss_family == AF_INET ? sizeof(struct sockaddr_in)
+                                        : sizeof(struct sockaddr_in6);
+  if (connect(s->fd, (struct sockaddr *)&ss, size) <
+      0)  // sizeof(struct sockaddr)) < 0)
+    goto ERR_CONNECT;
+
+  return LIBHICNCTRL_SUCCESS;
+
+ERR_CONNECT:
+ERR_PARSE:
+  return LIBHICNCTRL_FAILURE;
+}
+
+int hc_sock_send(hc_sock_t *s, hc_msg_t *msg, size_t msglen) {
+  return send(s->fd, msg, msglen, 0);
+}
+
+int hc_sock_get_available(hc_sock_t *s, u8 **buffer, size_t *size) {
+  *buffer = s->buf + s->woff;
+  *size = RECV_BUFLEN - s->woff;
+
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_sock_recv(hc_sock_t *s, hc_data_t *data) {
+  int rc;
+
+  /*
+   * This condition should be ensured to guarantee correct processing of
+   * messages
+   */
+  assert(RECV_BUFLEN - s->woff > MIN_BUFLEN);
+
+  rc = recv(s->fd, s->buf + s->woff, RECV_BUFLEN - s->woff, 0);
+  if (rc == 0) {
+    printf("connection closed\n");
+    return LIBHICNCTRL_FAILURE;
+    /* Connection has been closed */
+    // XXX
+  }
+  if (rc < 0) {
+    /* Error occurred */
+    printf("error occurred\n");
+    // XXX check for EWOULDBLOCK;
+    // XXX
+    return LIBHICNCTRL_FAILURE;
+  }
+  s->woff += rc;
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_sock_process(hc_sock_t *s, hc_data_t *data,
+                    int (*parse)(const u8 *src, u8 *dst)) {
+  int err = 0;
+
+  /* We must have received at least one byte */
+  size_t available = s->woff - s->roff;
+
+  while (available > 0) {
+    if (s->remaining == 0) {
+      hc_msg_t *msg = (hc_msg_t *)(s->buf + s->roff);
+
+      /* We expect a message header */
+      if (available < sizeof(hc_msg_header_t)) break;
+
+      /* Sanity checks (might instead raise warnings) */
+      // TODO: sync check ?
+      assert((msg->hdr.messageType == RESPONSE_LIGHT) ||
+             (msg->hdr.messageType == ACK_LIGHT) ||
+             (msg->hdr.messageType == NACK_LIGHT));
+      // assert(msg->hdr.commandID == data->command_id); // FIXME
+      assert(msg->hdr.seqNum == s->recv_seq++);
+
+      s->remaining = msg->hdr.length;
+      if (s->remaining == 0) {
+        /*
+         * The protocol expects all sequence number to be reset after
+         * each transaction. We reset before running the callback in
+         * case it triggers new exchanges.
+         */
+        s->send_seq = HICN_CTRL_SEND_SEQ_INIT;
+        s->recv_seq = HICN_CTRL_RECV_SEQ_INIT;
+
+        // TODO : check before even sending ?
+        /* Complete message without payload */
+        // TODO : is this correct ? no error code ?
+        hc_data_set_complete(data);
+      }
+
+      available -= sizeof(hc_msg_header_t);
+      s->roff += sizeof(hc_msg_header_t);
+    } else {
+      /* We expect the complete payload, or at least a chunk of it */
+      size_t num_chunks = available / data->in_element_size;
+      if (num_chunks == 0) break;
+      if (num_chunks > s->remaining) num_chunks = s->remaining;
+
+      if (!parse) {
+        hc_data_push_many(data, s->buf + s->roff, num_chunks);
+      } else {
+        int rc;
+        rc = hc_data_ensure_available(data, num_chunks);
+        if (rc < 0) return LIBHICNCTRL_FAILURE;
+        for (int i = 0; i < num_chunks; i++) {
+          u8 *dst = hc_data_get_next(data);
+          if (!dst) return LIBHICNCTRL_FAILURE;
+
+          rc = parse(s->buf + s->roff + i * data->in_element_size, dst);
+          if (rc < 0) err = -1; /* FIXME we let the loop complete (?) */
+          data->size++;
+        }
+      }
+
+      s->remaining -= num_chunks;
+      if (s->remaining == 0) {
+        /*
+         * The protocol expects all sequence number to be reset after
+         * each transaction. We reset before running the callback in
+         * case it triggers new exchanges.
+         */
+        s->send_seq = HICN_CTRL_SEND_SEQ_INIT;
+        s->recv_seq = HICN_CTRL_RECV_SEQ_INIT;
+
+        hc_data_set_complete(data);
+      }
+
+      available -= num_chunks * data->in_element_size;
+      s->roff += num_chunks * data->in_element_size;
+    }
+  }
+
+  /* Make sure there is enough remaining space in the buffer */
+  if (RECV_BUFLEN - s->woff < AVG_BUFLEN) {
+    /*
+     * There should be no overlap provided a sufficiently large BUFLEN, but
+     * who knows.
+     */
+    memmove(s->buf, s->buf + s->roff, s->woff - s->roff);
+    s->woff -= s->roff;
+    s->roff = 0;
+  }
+
+  return err;
+}
+
+int hc_sock_reset(hc_sock_t *s) {
+  s->roff = s->woff = 0;
+  s->send_seq = HICN_CTRL_SEND_SEQ_INIT;
+  s->recv_seq = HICN_CTRL_RECV_SEQ_INIT;
+  s->remaining = 0;
+  return LIBHICNCTRL_SUCCESS;
+}
+
+/******************************************************************************
+ * Command-specific structures and functions
+ ******************************************************************************/
+
+typedef int (*HC_PARSE)(const u8 *, u8 *);
+
+typedef struct {
+  hc_action_t cmd;
+  command_id cmd_id;
+  size_t size_in;
+  size_t size_out;
+  HC_PARSE parse;
+} hc_command_params_t;
+
+int hc_execute_command(hc_sock_t *s, hc_msg_t *msg, size_t msg_len,
+                       hc_command_params_t *params, hc_data_t **pdata) {
+  /* Sanity check */
+  switch (params->cmd) {
+    case ACTION_CREATE:
+      assert(params->size_in != 0); /* payload repeated */
+      assert(params->size_out == 0);
+      assert(params->parse == NULL);
+      break;
+    case ACTION_DELETE:
+      assert(params->size_in != 0); /* payload repeated */
+      assert(params->size_out == 0);
+      assert(params->parse == NULL);
+      break;
+    case ACTION_LIST:
+      assert(params->size_in != 0);
+      assert(params->size_out != 0);
+      assert(params->parse != NULL);
+      break;
+    case ACTION_SET:
+      assert(params->size_in != 0);
+      assert(params->size_out == 0);
+      assert(params->parse == NULL);
+      break;
+    default:
+      return LIBHICNCTRL_FAILURE;
+  }
+
+  hc_sock_reset(s);
+
+  /* XXX data will at least store the result (complete) */
+  hc_data_t *data = hc_data_create(params->size_in, params->size_out);
+  if (!data) goto ERR_DATA;
+
+  hc_sock_send(s, msg, msg_len);
+  while (!data->complete) {
+    if (hc_sock_recv(s, data) < 0) break;
+    // XXX XXX XXX Process data with no resut !!!! XXX XXX XXX
+    // XXX just return code
+    // we are receiving the exact same message we have sent with a ACK
+    // or NACK instead of the command !
+    if (hc_sock_process(s, data, params->parse) < 0) {
+      // ERROR PROCESSING... RESET ? XXX
+      goto ERR_PROCESS;
+    }
+  }
+
+  if (pdata) *pdata = data;
+
+  return LIBHICNCTRL_SUCCESS;
+
+ERR_PROCESS:
+  free(data);
+ERR_DATA:
+  return LIBHICNCTRL_FAILURE;
+}
+
+/* /!\ Please update constants in header file upon changes */
+size_t hc_url_snprintf(char *s, size_t size, int family,
+                       ip_address_t *ip_address, u16 port) {
+  char *cur = s;
+  int rc;
+
+  /* Other address are currently not supported */
+  assert(IS_VALID_FAMILY(family));
+
+  rc = snprintf(cur, s + size - cur, "inet%c://",
+                (family == AF_INET) ? '4' : '6');
+  if (rc < 0) return rc;
+  cur += rc;
+  if (size != 0 && cur >= s + size) return cur - s;
+
+  rc = ip_address_snprintf(cur, s + size - cur, ip_address, family);
+  if (rc < 0) return rc;
+  cur += rc;
+  if (size != 0 && cur >= s + size) return cur - s;
+
+  rc = snprintf(cur, s + size - cur, ":");
+  if (rc < 0) return rc;
+  cur += rc;
+  if (size != 0 && cur >= s + size) return cur - s;
+
+  rc = snprintf(cur, s + size - cur, "%d", port);
+  if (rc < 0) return rc;
+  cur += rc;
+  if (size != 0 && cur >= s + size) return cur - s;
+
+  return cur - s;
+}
+
+/*----------------------------------------------------------------------------*
+ * Listeners
+ *----------------------------------------------------------------------------*/
+
+int hc_parse_listener(void *in, hc_listener_t *listener) {
+  list_listeners_command *cmd = (list_listeners_command *)in;
+
+  if (!IS_VALID_LIST_LISTENERS_TYPE(cmd->encapType)) return LIBHICNCTRL_FAILURE;
+
+  hc_connection_type_t type = map_from_encap_type[cmd->encapType];
+  if (type == CONNECTION_TYPE_UNDEFINED) return LIBHICNCTRL_FAILURE;
+
+  if (!IS_VALID_ADDR_TYPE(cmd->addressType)) return LIBHICNCTRL_FAILURE;
+
+  int family = map_from_addr_type[cmd->addressType];
+  if (!IS_VALID_FAMILY(family)) return LIBHICNCTRL_FAILURE;
+
+  *listener = (hc_listener_t){
+      .conn_id = cmd->connid,
+      .type = type,
+      .family = family,
+      .local_addr = UNION_CAST(cmd->address, ip_address_t),
+      .local_port = ntohs(cmd->port),
+  };
+  bzero(listener->name, NAME_LEN);
+  return LIBHICNCTRL_SUCCESS;
+}
+
+typedef struct {
+  header_control_message hdr;
+  add_listener_command payload;
+} hc_msg_listener_add_t;
+
+int hc_listener_create(hc_sock_t *s, hc_listener_t *listener) {
+  if (!IS_VALID_FAMILY(listener->family)) return LIBHICNCTRL_FAILURE;
+
+  if (!IS_VALID_CONNECTION_TYPE(listener->type)) return LIBHICNCTRL_FAILURE;
+
+  hc_msg_listener_add_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = ADD_LISTENER,
+              .length = 1,
+              .seqNum = s->send_seq,
+          },
+      .payload = {
+          .address =
+              {
+                  .ipv6 = listener->local_addr.v6.as_in6addr,
+              },
+          .port = htons(listener->local_port),
+          .addressType = (u8)map_to_addr_type[listener->family],
+          .listenerMode = (u8)map_to_listener_mode[listener->type],
+          .connectionType = (u8)map_to_connection_type[listener->type],
+      }};
+  strncpy(msg.payload.symbolic, listener->name, NAME_LEN);
+
+  hc_command_params_t params = {
+      .cmd = ACTION_CREATE,
+      .cmd_id = ADD_LISTENER,
+      .size_in = sizeof(add_listener_command),
+      .size_out = 0,
+      .parse = NULL,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, NULL);
+}
+
+typedef struct {
+  header_control_message hdr;
+} hc_msg_listener_list_t;
+
+int hc_listener_list(hc_sock_t *s, hc_data_t **pdata) {
+  hc_msg_listener_list_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = LIST_LISTENERS,
+              .length = 0,
+              .seqNum = s->send_seq,
+          },
+  };
+
+  hc_command_params_t params = {
+      .cmd = ACTION_LIST,
+      .cmd_id = LIST_LISTENERS,
+      .size_in = sizeof(list_listeners_command),
+      .size_out = sizeof(hc_listener_t),
+      .parse = (HC_PARSE)hc_parse_listener,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, pdata);
+}
+
+int hc_listener_cmp(const hc_listener_t *l1, const hc_listener_t *l2) {
+  return ((l1->type == l2->type) && (l1->family == l2->family) &&
+          (memcmp(&l1->local_addr, &l2->local_addr, sizeof(ip_address_t))) &&
+          (l1->local_port == l2->local_port))
+             ? LIBHICNCTRL_SUCCESS
+             : LIBHICNCTRL_FAILURE;
+}
+
+/* /!\ Please update constants in header file upon changes */
+size_t hc_listener_snprintf(char *s, size_t size, hc_listener_t *listener) {
+  char local[MAXSZ_HC_URL];
+  int rc;
+
+  rc = hc_url_snprintf(local, MAXSZ_HC_URL, listener->family,
+                       &listener->local_addr, listener->local_port);
+  if (rc < 0) return rc;
+
+  return snprintf(s, size, "%s %s", local, connection_type_str[listener->type]);
+}
+
+/*----------------------------------------------------------------------------*
+ * Connections
+ *----------------------------------------------------------------------------*/
+
+int hc_parse_connection(void *in, hc_connection_t *connection) {
+  list_connections_command *cmd = (list_connections_command *)in;
+
+  if (!IS_VALID_LIST_CONNECTIONS_TYPE(cmd->connectionData.connectionType))
+    return LIBHICNCTRL_FAILURE;
+
+  hc_connection_type_t type =
+      map_from_list_connections_type[cmd->connectionData.connectionType];
+  if (type == CONNECTION_TYPE_UNDEFINED) return LIBHICNCTRL_FAILURE;
+
+  if (!IS_VALID_LIST_CONNECTIONS_STATE(cmd->state)) return LIBHICNCTRL_FAILURE;
+
+  hc_connection_state_t state = map_from_list_connections_state[cmd->state];
+  if (state == CONNECTION_STATE_UNDEFINED) return LIBHICNCTRL_FAILURE;
+
+  if (!IS_VALID_ADDR_TYPE(cmd->connectionData.ipType))
+    return LIBHICNCTRL_FAILURE;
+
+  int family = map_from_addr_type[cmd->connectionData.ipType];
+  if (!IS_VALID_FAMILY(family)) return LIBHICNCTRL_FAILURE;
+
+  *connection = (hc_connection_t){
+      .id = cmd->connid,
+      .type = type,
+      .family = family,
+      .local_addr = UNION_CAST(cmd->connectionData.localIp, ip_address_t),
+      .local_port = ntohs(cmd->connectionData.localPort),
+      .remote_addr = UNION_CAST(cmd->connectionData.remoteIp, ip_address_t),
+      .remote_port = ntohs(cmd->connectionData.remotePort),
+#ifdef WITH_POLICY
+      .desired_state = cmd->connectionData.desired_state,
+      .tags = cmd->connectionData.tags,
+#endif /* WITH_POLICY */
+      .state = state,
+  };
+  strncpy(connection->name, cmd->connectionData.symbolic, NAME_LEN);
+  return LIBHICNCTRL_SUCCESS;
+}
+
+typedef struct {
+  header_control_message hdr;
+  add_connection_command payload;
+} hc_msg_connection_add_t;
+
+int hc_connection_create(hc_sock_t *s, hc_connection_t *connection) {
+  if (!IS_VALID_FAMILY(connection->family)) return LIBHICNCTRL_FAILURE;
+
+  if (!IS_VALID_CONNECTION_TYPE(connection->type)) return LIBHICNCTRL_FAILURE;
+
+  /* TODO assert both local and remote have the right family */
+
+  hc_msg_connection_add_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = ADD_CONNECTION,
+              .length = 1,
+              .seqNum = s->send_seq,
+          },
+      .payload = {
+          /* we use IPv6 which is the longest address */
+          .remoteIp.ipv6 = connection->remote_addr.v6.as_in6addr,
+          .localIp.ipv6 = connection->local_addr.v6.as_in6addr,
+          .remotePort = htons(connection->remote_port),
+          .localPort = htons(connection->local_port),
+          .ipType = (u8)map_to_addr_type[connection->family],
+#ifdef WITH_POLICY
+          .desired_state = connection->desired_state,
+          .tags = connection->tags,
+#endif /* WITH_POLICY */
+          .connectionType = (u8)map_to_connection_type[connection->type],
+      }};
+  strncpy(msg.payload.symbolic, connection->name, NAME_LEN);
+
+  hc_command_params_t params = {
+      .cmd = ACTION_CREATE,
+      .cmd_id = ADD_CONNECTION,
+      .size_in = sizeof(add_connection_command),
+      .size_out = 0,
+      .parse = NULL,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, NULL);
+}
+
+typedef struct {
+  header_control_message hdr;
+  remove_connection_command payload;
+} hc_msg_connection_remove_t;
+
+int hc_connection_delete(hc_sock_t *s, hc_connection_t *connection) {
+  hc_msg_connection_remove_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = REMOVE_CONNECTION,
+              .length = 1,
+              .seqNum = s->send_seq,
+          },
+  };
+  strncpy(msg.payload.symbolicOrConnid, connection->name, NAME_LEN);
+
+  hc_command_params_t params = {
+      .cmd = ACTION_DELETE,
+      .cmd_id = REMOVE_CONNECTION,
+      .size_in = sizeof(remove_connection_command),
+      .size_out = 0,
+      .parse = NULL,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, NULL);
+}
+
+#ifdef WITH_POLICY
+typedef struct {
+  header_control_message hdr;
+  connection_set_state_command payload;
+} hc_msg_connection_set_state_t;
+
+int hc_connection_set_state(hc_sock_t *s, const char *conn_id_or_name,
+                            face_state_t state) {
+  hc_msg_connection_set_state_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = CONNECTION_SET_STATE,
+              .length = 1,
+              .seqNum = s->send_seq,
+          },
+      .payload =
+          {
+              .state = state,
+          },
+  };
+  strncpy(msg.payload.symbolicOrConnid, conn_id_or_name, NAME_LEN);
+
+  hc_command_params_t params = {
+      .cmd = ACTION_SET,
+      .cmd_id = CONNECTION_SET_STATE,
+      .size_in = sizeof(connection_set_state_command),
+      .size_out = 0,
+      .parse = NULL,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, NULL);
+}
+#endif /* WITH_POLICY */
+
+typedef struct {
+  header_control_message hdr;
+} hc_msg_connection_list_t;
+
+int hc_connection_list(hc_sock_t *s, hc_data_t **pdata) {
+  hc_msg_connection_list_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = LIST_CONNECTIONS,
+              .length = 0,
+              .seqNum = s->send_seq,
+          },
+  };
+
+  hc_command_params_t params = {
+      .cmd = ACTION_LIST,
+      .cmd_id = LIST_CONNECTIONS,
+      .size_in = sizeof(list_connections_command),
+      .size_out = sizeof(hc_connection_t),
+      .parse = (HC_PARSE)hc_parse_connection,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, pdata);
+}
+
+/* /!\ Please update constants in header file upon changes */
+size_t hc_connection_snprintf(char *s, size_t size,
+                              hc_connection_t *connection) {
+  char local[MAXSZ_HC_URL];
+  char remote[MAXSZ_HC_URL];
+  int rc;
+
+  // assert(connection->connection_state)
+
+  rc = hc_url_snprintf(local, MAXSZ_HC_URL, connection->family,
+                       &connection->local_addr, connection->local_port);
+  if (rc < 0) return rc;
+  rc = hc_url_snprintf(remote, MAXSZ_HC_URL, connection->family,
+                       &connection->remote_addr, connection->remote_port);
+  if (rc < 0) return rc;
+
+  return snprintf(s, size, "%s %s %s %s",
+                  connection_state_str[connection->state], local, remote,
+                  connection_type_str[connection->type]);
+}
+
+/*----------------------------------------------------------------------------*
+ * Routes
+ *----------------------------------------------------------------------------*/
+
+int hc_parse_route(void *in, hc_route_t *route) {
+  list_routes_command *cmd = (list_routes_command *)in;
+
+  if (!IS_VALID_ADDR_TYPE(cmd->addressType)) return LIBHICNCTRL_FAILURE;
+
+  int family = map_from_addr_type[cmd->addressType];
+  if (!IS_VALID_FAMILY(family)) return LIBHICNCTRL_FAILURE;
+
+  *route = (hc_route_t){
+      .conn_id = cmd->connid,
+      .family = family,
+      .remote_addr = UNION_CAST(cmd->address, ip_address_t),
+      .len = cmd->len,
+      .cost = cmd->cost,
+  };
+  bzero(route->conn_name, NAME_LEN);
+  return LIBHICNCTRL_SUCCESS;
+}
+
+typedef struct {
+  header_control_message hdr;
+  add_route_command payload;
+} hc_msg_route_add_t;
+
+int hc_route_create(hc_sock_t *s, hc_route_t *route) {
+  if (!IS_VALID_FAMILY(route->family)) return LIBHICNCTRL_FAILURE;
+
+  hc_msg_route_add_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = ADD_ROUTE,
+              .length = 1,
+              .seqNum = s->send_seq,
+          },
+      .payload = {
+          /* we use IPv6 which is the longest address */
+          .address.ipv6 = route->remote_addr.v6.as_in6addr,
+          .cost = route->cost,
+          .addressType = (u8)map_to_addr_type[route->family],
+          .len = route->len,
+      }};
+  strncpy(msg.payload.symbolicOrConnid, route->conn_name, NAME_LEN);
+
+  hc_command_params_t params = {
+      .cmd = ACTION_CREATE,
+      .cmd_id = ADD_ROUTE,
+      .size_in = sizeof(add_route_command),
+      .size_out = 0,
+      .parse = NULL,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, NULL);
+}
+
+typedef struct {
+  header_control_message hdr;
+  remove_route_command payload;
+} hc_msg_route_remove_t;
+
+int hc_route_delete(hc_sock_t *s, hc_route_t *route) {
+  if (!IS_VALID_FAMILY(route->family)) return LIBHICNCTRL_FAILURE;
+
+  hc_msg_route_remove_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = REMOVE_ROUTE,
+              .length = 1,
+              .seqNum = s->send_seq,
+          },
+      .payload = {
+          /* we use IPv6 which is the longest address */
+          .address.ipv6 = route->remote_addr.v6.as_in6addr,
+          .addressType = (u8)map_to_addr_type[route->family],
+          .len = route->len,
+      }};
+  strncpy(msg.payload.symbolicOrConnid, route->conn_name, NAME_LEN);
+
+  hc_command_params_t params = {
+      .cmd = ACTION_DELETE,
+      .cmd_id = REMOVE_ROUTE,
+      .size_in = sizeof(remove_route_command),
+      .size_out = 0,
+      .parse = NULL,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, NULL);
+}
+
+typedef struct {
+  header_control_message hdr;
+} hc_msg_route_list_t;
+
+int hc_route_list(hc_sock_t *s, hc_data_t **pdata) {
+  hc_msg_route_list_t msg = {
+      .hdr =
+          {
+              .messageType = REQUEST_LIGHT,
+              .commandID = LIST_ROUTES,
+              .length = 0,
+              .seqNum = s->send_seq,
+          },
+  };
+
+  hc_command_params_t params = {
+      .cmd = ACTION_LIST,
+      .cmd_id = LIST_ROUTES,
+      .size_in = sizeof(list_routes_command),
+      .size_out = sizeof(hc_route_t),
+      .parse = (HC_PARSE)hc_parse_route,
+  };
+
+  return hc_execute_command(s, (hc_msg_t *)&msg, sizeof(msg), &params, pdata);
+}
+
+/* /!\ Please update constants in header file upon changes */
+size_t hc_route_snprintf(char *s, size_t size, hc_route_t *route) {
+  return LIBHICNCTRL_SUCCESS;
+}
+
+/*----------------------------------------------------------------------------*
+ * Face
+ *----------------------------------------------------------------------------*/
+
+int hc_face_to_listener(const hc_face_t *face, hc_listener_t *listener) {
+  const face_t *f = &face->face;
+
+  switch (f->type) {
+    case FACE_TYPE_HICN_LISTENER:
+      break;
+    case FACE_TYPE_TCP_LISTENER:
+      break;
+    case FACE_TYPE_UDP_LISTENER:
+      break;
+    default:
+      return LIBHICNCTRL_FAILURE;
+  }
+  return LIBHICNCTRL_FAILURE; /* Not implemented */
+}
+
+int hc_face_to_connection(const hc_face_t *face, hc_connection_t *connection) {
+  const face_t *f = &face->face;
+
+  switch (f->type) {
+    case FACE_TYPE_HICN:
+      /* FIXME truncations, collisions, ... */
+      *connection = (hc_connection_t){
+          .type = CONNECTION_TYPE_HICN,
+          .family = f->hicn.family,
+          .local_addr = f->hicn.local_addr,
+          .local_port = 0,
+          .remote_addr = f->hicn.remote_addr,
+          .remote_port = 0,
+      };
+      snprintf(connection->name, NAME_LEN, "%s", f->hicn.netdevice.name);
+      break;
+    case FACE_TYPE_TCP:
+      *connection = (hc_connection_t){
+          .type = CONNECTION_TYPE_TCP,
+          .family = f->hicn.family,
+          .local_addr = f->tunnel.local_addr,
+          .local_port = f->tunnel.local_port,
+          .remote_addr = f->tunnel.remote_addr,
+          .remote_port = f->tunnel.remote_port,
+      };
+#ifdef __APPLE__
+      snprintf(connection->name, NAME_LEN, "tcp%d", arc4random() & 0xFF);
+#else
+      snprintf(connection->name, NAME_LEN, "tcp%ld", random() & 0xFF);
+#endif
+      break;
+    case FACE_TYPE_UDP:
+      *connection = (hc_connection_t){
+          .type = CONNECTION_TYPE_UDP,
+          .family = AF_INET,
+          .local_addr = f->tunnel.local_addr,
+          .local_port = f->tunnel.local_port,
+          .remote_addr = f->tunnel.remote_addr,
+          .remote_port = f->tunnel.remote_port,
+      };
+#ifdef __APPLE__
+      snprintf(connection->name, NAME_LEN, "udp%d", arc4random() & 0xFF);
+#else
+      snprintf(connection->name, NAME_LEN, "udp%ld", random() & 0xFF);
+#endif
+      printf("Created f %s !\n", connection->name);
+      break;
+    default:
+      return LIBHICNCTRL_FAILURE;
+  }
+
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_connection_to_face(const hc_connection_t *connection, hc_face_t *face) {
+  switch (connection->type) {
+    case CONNECTION_TYPE_TCP:
+      *face = (hc_face_t){
+          .id = connection->id,
+          .face =
+              {
+                  .type = FACE_TYPE_TCP,
+                  .tunnel =
+                      {
+                          .family = connection->family,
+                          .local_addr = connection->local_addr,
+                          .local_port = connection->local_port,
+                          .remote_addr = connection->remote_addr,
+                          .remote_port = connection->remote_port,
+                      },
+              },
+      };
+      break;
+    case CONNECTION_TYPE_UDP:
+      *face = (hc_face_t){
+          .id = connection->id,
+          .face =
+              {
+                  .type = FACE_TYPE_UDP,
+                  .tunnel =
+                      {
+                          .family = connection->family,
+                          .local_addr = connection->local_addr,
+                          .local_port = connection->local_port,
+                          .remote_addr = connection->remote_addr,
+                          .remote_port = connection->remote_port,
+                      },
+              },
+      };
+      break;
+    case CONNECTION_TYPE_HICN:
+      *face = (hc_face_t){
+          .id = connection->id,
+          .face =
+              {
+                  .type = FACE_TYPE_HICN,
+                  .hicn =
+                      {
+                          .family = connection->family,
+                          .netdevice.index = NETDEVICE_UNDEFINED_INDEX,  // XXX
+                          .local_addr = connection->local_addr,
+                          .remote_addr = connection->remote_addr,
+                      },
+              },
+      };
+      break;
+    default:
+      return LIBHICNCTRL_FAILURE;
+  }
+  strncpy(face->name, connection->name, NAME_LEN);
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_connection_to_local_listener(const hc_connection_t *connection,
+                                    hc_listener_t *listener) {
+  *listener = (hc_listener_t){
+      .conn_id = ~0,
+      .type = connection->type,
+      .family = connection->family,
+      .local_addr = connection->local_addr,
+      .local_port = connection->local_port,
+  };
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_face_create(hc_sock_t *s, hc_face_t *face) {
+  hc_connection_t connection;
+  hc_data_t *listeners;
+  hc_listener_t listener;
+  hc_listener_t *found;
+
+  switch (face->face.type) {
+    case FACE_TYPE_HICN:
+    case FACE_TYPE_TCP:
+    case FACE_TYPE_UDP:
+      if (hc_face_to_connection(face, &connection) < 0)
+        return LIBHICNCTRL_FAILURE;
+
+      /* Ensure we have a corresponding local listener */
+      if (hc_connection_to_local_listener(&connection, &listener) < 0)
+        return LIBHICNCTRL_FAILURE;
+
+      /* We might cache results for faster future lookups (at least to
+       * test existence) */
+      if (hc_listener_list(s, &listeners) < 0) return LIBHICNCTRL_FAILURE;
+
+      /* Test */
+      if (hc_data_find(listeners, &listener, (cmp_t)hc_listener_cmp,
+                       (void **)&found) < 0)
+        return LIBHICNCTRL_FAILURE;
+
+      hc_data_free(listeners);
+
+      if (!found) {
+        /* We need to create the listener if it does not exists */
+        if (hc_listener_create(s, &listener) < 0) return LIBHICNCTRL_FAILURE;
+      }
+
+      if (hc_connection_create(s, &connection) < 0) return LIBHICNCTRL_FAILURE;
+
+      break;
+
+    case FACE_TYPE_HICN_LISTENER:
+    case FACE_TYPE_TCP_LISTENER:
+    case FACE_TYPE_UDP_LISTENER:
+      if (hc_face_to_listener(face, &listener) < 0) return LIBHICNCTRL_FAILURE;
+      if (hc_listener_create(s, &listener) < 0) return LIBHICNCTRL_FAILURE;
+      return LIBHICNCTRL_FAILURE;
+      break;
+    default:
+      return LIBHICNCTRL_FAILURE;
+  };
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_face_delete(hc_sock_t *s, hc_face_t *face) {
+  /* We currently do not delete the listener */
+  hc_connection_t connection;
+  if (hc_face_to_connection(face, &connection) < 0) return LIBHICNCTRL_FAILURE;
+  return hc_connection_delete(s, &connection);
+}
+
+int hc_face_list(hc_sock_t *s, hc_data_t **pdata) {
+  hc_data_t *connection_data;
+  hc_face_t face;
+
+  if (hc_connection_list(s, &connection_data) < 0) return LIBHICNCTRL_FAILURE;
+
+  hc_data_t *face_data =
+      hc_data_create(sizeof(hc_connection_t), sizeof(hc_face_t));
+  foreach_connection(c, connection_data) {
+    if (hc_connection_to_face(c, &face) < 0) goto ERR;
+    hc_data_push(face_data, &face);
+  }
+
+  *pdata = face_data;
+  hc_data_free(connection_data);
+  return LIBHICNCTRL_SUCCESS;
+
+ERR:
+  hc_data_free(connection_data);
+  return LIBHICNCTRL_FAILURE;
+}
+
+#ifdef WITH_POLICY
+int hc_face_set_state(hc_sock_t *s, const char *conn_id_or_name,
+                      face_state_t state) {
+  return hc_connection_set_state(s, conn_id_or_name, state);
+}
+#endif /* WITH_POLICY */
+/* /!\ Please update constants in header file upon changes */
+size_t hc_face_snprintf(char *s, size_t size, hc_face_t *face) {
+  return LIBHICNCTRL_SUCCESS;
+}
+
+/*----------------------------------------------------------------------------*
+ * Cache
+ *----------------------------------------------------------------------------*/
+
+int hc_cache_set_store(hc_sock_t *s, int enabled) {
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_cache_set_serve(hc_sock_t *s, int enabled) {
+  return LIBHICNCTRL_SUCCESS;
+}
+
+/*----------------------------------------------------------------------------*
+ * Punting
+ *----------------------------------------------------------------------------*/
+
+int hc_punting_create(hc_sock_t *s /* XXX */) { return LIBHICNCTRL_SUCCESS; }
+
+/*----------------------------------------------------------------------------*
+ * Strategy
+ *----------------------------------------------------------------------------*/
+
+// per prefix
+int hc_strategy_set(hc_sock_t *s /* XXX */) { return LIBHICNCTRL_SUCCESS; }
+
+/*----------------------------------------------------------------------------*
+ * FIB
+ *----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*
+ * PIT
+ *----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*
+ * WLDR
+ *----------------------------------------------------------------------------*/
+
+// per connection
+int hc_wldr_set(hc_sock_t *s /* XXX */) { return LIBHICNCTRL_SUCCESS; }
+
+/*----------------------------------------------------------------------------*
+ * MAP-Me
+ *----------------------------------------------------------------------------*/
+
+int hc_mapme_set(hc_sock_t *s, int enabled) { return LIBHICNCTRL_SUCCESS; }
+
+int hc_mapme_set_discovery(hc_sock_t *s, int enabled) {
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_mapme_set_timescale(hc_sock_t *s, double timescale) {
+  return LIBHICNCTRL_SUCCESS;
+}
+
+int hc_mapme_set_retx(hc_sock_t *s, double timescale) {
+  return LIBHICNCTRL_SUCCESS;
+}
diff --git a/hicn-light/src/hicn/api/api.h b/hicn-light/src/hicn/api/api.h
new file mode 100644
index 000000000..e2358167c
--- /dev/null
+++ b/hicn-light/src/hicn/api/api.h
@@ -0,0 +1,580 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+/**
+ * \file api.h
+ * \brief hICN control library API
+ */
+
+#ifndef HICNTRL_API
+#define HICNTRL_API
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <hicn/api/face.h>
+
+/**
+ * This allows to selectively define convenience types to avoid any collision
+ * when using the library in conjunction with other frameworks including similar
+ * defines
+ */
+#ifdef _HICNTRL_NO_DEFS
+#define _HICNTRL_NO_DEF_TYPES
+#define _HICNTRL_NO_DEF_IPADDR
+#define _HICNTRL_NO_DEF_UNIONCAST
+#endif
+
+#ifndef _HICNTRL_NO_DEF_TYPES
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+#endif /* _HICNTRL_NO_DEF_TYPES */
+
+#ifndef _HICNTRL_NO_DEF_IPADDR
+#include <hicn/api/ip_address.h>
+#endif /* _HICNTRL_NO_DEF_IPADDR */
+
+#ifndef _HICNTRL_NO_DEF_UNIONCAST
+/* Helper for avoiding warnings about type-punning */
+#define UNION_CAST(x, destType) \
+  (((union {                    \
+     __typeof__(x) a;           \
+     destType b;                \
+   })x)                         \
+       .b)
+#endif /* _HICNTRL_NO_DEF_UNIONCAST */
+
+/******************************************************************************
+ * Message helper types and aliases
+ ******************************************************************************/
+
+#define foreach_command \
+  _(UNDEFINED)          \
+  _(CREATE)             \
+  _(DELETE)             \
+  _(LIST)               \
+  _(SET)                \
+  _(N)
+
+typedef enum {
+#define _(x) ACTION_##x,
+  foreach_command
+#undef _
+} hc_action_t;
+
+/**
+ * \brief hICN control message header
+ */
+typedef struct hc_msg_s hc_msg_t;
+
+/******************************************************************************
+ * Control Data
+ ******************************************************************************/
+
+struct hc_data_s;
+typedef int (*data_callback_t)(struct hc_data_s *, void *);
+
+/**
+ * \brief Holds the results of an hICN control request
+ */
+typedef struct hc_data_s {
+  size_t size;
+  size_t max_size_log;
+  size_t in_element_size;
+  size_t out_element_size;
+  u8 command_id; /**< Expected message type (should give element size) */
+  u8 *buffer;
+  bool complete;
+
+  /* Callbacks */
+  data_callback_t
+      complete_cb;  // XXX int (*complete_cb)(struct hc_data_s * data);
+  void *complete_cb_data;
+} hc_data_t;
+
+/**
+ * Create a structure holding the results of an hICN control request.
+ * \result The newly create data structure.
+ */
+hc_data_t *hc_data_create(size_t in_element_size, size_t out_element_size);
+
+/**
+ * Free a structure holding the results of an hICN control request.
+ * \param [in] data - The data structure to free.
+ */
+void hc_data_free(hc_data_t *data);
+
+/**
+ * \brief Adds many new results at the end of the data structure, eventually
+ * allocating buffer space for it.
+ * \param [in] data - The data structure to which to add elements.
+ * \param [in] elements - The array of elements to add.
+ * \param [in] count - The number of elements to add.
+ * \return Error code
+ *
+ * NOTE: The size of the element should match the one declared at structure
+ * initialization.
+ */
+int hc_data_push_many(hc_data_t *data, const void *elements, size_t count);
+
+/**
+ * \brief Adds a new result at the end of the data structure, eventually
+ * allocating buffer space for it.
+ * \param [in] data - The data structure to which to add an element.
+ * \param [in] element - The element to add
+ * \return Error code
+ *
+ * NOTE: The size of the element should match the one declared at structure
+ * initialization.
+ */
+int hc_data_push(hc_data_t *data, const void *element);
+
+/**
+ * \brief Configure a callback (along with private data) to be called upon
+ * completion of a request
+ * \param [in] data - hICN control data
+ * \param [in] cb - Callback function
+ * \param [in] cb_data - Callback private data
+ */
+int hc_data_set_callback(hc_data_t *data, data_callback_t cb, void *cb_data);
+
+/**
+ * \brief Mark the data structure as complete.
+ * \param [in] data - The data structure to which to add an element.
+ * \return The error code resulting from callback execution if any. 0 is
+ * returned if the callback executed successfully, or if no callback were
+ * defined.
+ */
+int hc_data_set_complete(hc_data_t *data);
+
+/**
+ * \brief Reset the data structure holding control data
+ * \param [in] data - hICN control data
+ * \return Error code
+ */
+int hc_data_reset(hc_data_t *data);
+
+/**
+ * \brief Find en element in the data structure
+ * \param [in] data - The data structure in which to find
+ * \param [in] element - The element to find
+ * \param [in] cmp - The element compare function
+ * \param [out] found - A pointer to the element, or NULL if not found.
+ * \return Error code
+ */
+int hc_data_find(hc_data_t *data, const void *element, cmp_t cmp, void **found);
+
+/******************************************************************************
+ * Control socket
+ ******************************************************************************/
+
+/* This should be at least equal to the maximum packet size */
+#define RECV_BUFLEN 8192
+
+/**
+ * \brief Holds the state of an hICN control socket
+ */
+typedef struct {
+  char *url;
+  int fd;
+  u32 seq;
+
+  /* Partial receive buffer */
+  u8 buf[RECV_BUFLEN];
+  size_t roff; /**< Read offset */
+  size_t woff; /**< Write offset */
+
+  /*
+   * Because received messages are potentially unbounded in size, we might not
+   * guarantee that we can store a full packet before processing it. We must
+   * implement a very simple state machine remembering the current parsing
+   * status in order to partially process the packet.
+   */
+  size_t remaining;
+  u32 send_id;
+  u32 send_seq;
+  u32 recv_seq;
+} hc_sock_t;
+
+/**
+ * \brief Create an hICN control socket using the specified URL.
+ * \param [in] url - The URL to connect to.
+ * \return an hICN control socket
+ */
+hc_sock_t *hc_sock_create_url(const char *url);
+
+/**
+ * \brief Create an hICN control socket using the default connection type.
+ * \return an hICN control socket
+ */
+hc_sock_t *hc_sock_create(void);
+
+/**
+ * \brief Frees an hICN control socket
+ */
+void hc_sock_free(hc_sock_t *s);
+
+/**
+ * \brief Sets the socket as non-blocking
+ * \return Error code
+ */
+int hc_sock_set_nonblocking(hc_sock_t *s);
+
+/**
+ * \brief Connect the socket
+ * \return Error code
+ */
+int hc_sock_connect(hc_sock_t *s);
+
+/**
+ * \brief Return the offset and size of available buffer space
+ * \param [in] sock - hICN control socket
+ * \param [out] buffer - Offset in buffer
+ * \param [out] size - Remaining size
+ * \return Error code
+ */
+int hc_sock_get_available(hc_sock_t *s, u8 **buffer, size_t *size);
+
+/**
+ * \brief Write/read iexchance on the control socket (internal helper function)
+ * \param [in] sock - hICN control socket
+ * \param [in] msg - Message to send
+ * \param [in] msglen - Length of the message to send
+ * \return Error code
+ */
+int hc_sock_send(hc_sock_t *s, hc_msg_t *msg, size_t msglen);
+
+/**
+ * \brief Helper for reading socket contents
+ * \param [in] sock - hICN control socket
+ * \param [in] data - Result data buffer
+ * \param [in] parse - Parse function to convert remote types into lib native
+ *      types, or NULL not to perform any translation.
+ * \return Error code
+ */
+int hc_sock_recv(hc_sock_t *s, hc_data_t *data);
+
+/**
+ * \brief Processing data received by socket
+ * \param [in] sock - hICN control socket
+ * \param [in] data - Result data buffer
+ * \param [in] parse - Parse function to convert remote types into lib native
+ *      types, or NULL not to perform any translation.
+ * \return Error code
+ */
+int hc_sock_process(hc_sock_t *s, hc_data_t *data,
+                    int (*parse)(const u8 *src, u8 *dst));
+
+/**
+ * \brief Reset the state of the sock (eg. to handle a reconnecton)
+ * \param [in] sock - hICN control socket
+ * \return Error code
+ */
+int hc_sock_reset(hc_sock_t *s);
+
+/******************************************************************************
+ * Command-specific structures and functions
+ ******************************************************************************/
+
+/*
+ * The following definitions are organized by sections each dealing with a
+ * specific object being manipulated. All follow a similar structure.
+ *
+ * TYPE DEFINITIONS AND ALIASES
+ *
+ * We redefine command struct:
+ *  - for uniformization
+ *  - to use enum instead of type specifiers more appropriate for packet format
+ *  - to use more flexible types such as for manipulating IP addresses
+ *  - host endianness
+ *  - more intuitive field name, ordering, consistency, and hierarchy removal
+ *  - to have command types in between add/list/... commands
+ *
+ * COMMAND IMPLEMENTATION
+ *
+ * All commands return information in a common format
+ *
+ * TODO describe + explain for commands with only return code.
+ *
+ * RETURN DATA FIXME
+ *
+ * \param [out] pdata - Pointer to the structure storing the results of the call
+ * (NULL if no data has been received). If the pointer is NULL, no result will
+ * be stored and only the error code will be exposed to the caller. It is
+ * expected that the caller frees this structure using hc_data_free() after
+ * usage.
+ * \see hc_data_free.
+ *
+ * PARSING
+ *
+ * While this is not made mandatory by the library, the returned data can be
+ * converted to the library's own data structures as described before.
+ *
+ * ITERATORS
+ *
+ * Macros are defined to facilitate iteration on the returned data structures.
+ */
+
+#ifndef SPACES
+#define SPACES(x) x
+#endif
+#ifndef SPACE
+#define SPACE SPACES(1)
+#endif
+#ifndef NULLTERM
+#define NULLTERM 1
+#endif
+
+#define NAME_LEN 16 /* NULL-terminated right ? */
+#define MAXSZ_HC_NAME_ NAME_LEN
+#define MAXSZ_HC_NAME MAXSZ_HC_NAME_ + NULLTERM
+
+#define MAXSZ_HC_ID_ 10 /* Number of digits for MAX_INT */
+#define MAXSZ_HC_ID MAXSZ_HC_ID_ + NULLTERM
+
+#define MAXSZ_HC_PROTO_ 8 /* inetX:// */
+#define MAXSZ_HC_PROTO MAXSZ_HC_PROTO_ + NULLTERM
+
+#define MAXSZ_HC_URL4_ MAXSZ_HC_PROTO_ + MAXSZ_IP4_ADDRESS_ + MAXSZ_PORT_
+#define MAXSZ_HC_URL6_ MAXSZ_HC_PROTO_ + MAXSZ_IP6_ADDRESS_ + MAXSZ_PORT_
+#define MAXSZ_HC_URL_ MAXSZ_HC_URL6_
+#define MAXSZ_HC_URL4 MAXSZ_HC_URL4_ + NULLTERM
+#define MAXSZ_HC_URL6 MAXSZ_HC_URL6_ + NULLTERM
+#define MAXSZ_HC_URL MAXSZ_HC_URL_ + NULLTERM
+
+size_t hc_url_snprintf(char *s, size_t size, int family,
+                       ip_address_t *ip_address, u16 port);
+
+#define foreach_type(TYPE, VAR, data)                                      \
+  for (TYPE *VAR = (TYPE *)data->buffer;                                   \
+       VAR < (TYPE *)(data->buffer + data->size * data->out_element_size); \
+       VAR++)
+
+/**
+ * New type is defined to reconciliate different enum for add and list.
+ * Also, values not implemented have been removed for clarity.
+ */
+#define foreach_connection_type \
+  _(UNDEFINED)                  \
+  _(TCP)                        \
+  _(UDP)                        \
+  _(HICN)                       \
+  _(N)
+
+typedef enum {
+#define _(x) CONNECTION_TYPE_##x,
+  foreach_connection_type
+#undef _
+} hc_connection_type_t;
+
+#define MAXSZ_HC_CONNECTION_TYPE_ 9
+#define MAXSZ_HC_CONNECTION_TYPE MAXSZ_HC_CONNECTION_TYPE_ + NULLTERM
+
+extern const char *connection_type_str[];
+
+hc_connection_type_t connection_type_from_str(const char *str);
+
+#define foreach_connection_state \
+  _(UNDEFINED)                   \
+  _(UP)                          \
+  _(DOWN)                        \
+  _(N)
+
+typedef enum {
+#define _(x) CONNECTION_STATE_##x,
+  foreach_connection_state
+#undef _
+} hc_connection_state_t;
+
+#define MAXSZ_HC_CONNECTION_STATE_ 9
+#define MAXSZ_HC_CONNECTION_STATE MAXSZ_HC_CONNECTION_STATE_ + NULLTERM
+
+extern const char *connection_state_str[];
+
+typedef int (*HC_PARSE)(const u8 *, u8 *);
+
+/*----------------------------------------------------------------------------*
+ * Listeners
+ *----------------------------------------------------------------------------*/
+
+typedef struct {
+  char name[NAME_LEN]; /* K.w */  // XXX clarify what used for
+  u32 conn_id;                    /* Kr. */
+  hc_connection_type_t type;      /* .rw */
+  int family;                     /* .rw */
+  ip_address_t local_addr;        /* .rw */
+  u16 local_port;                 /* .rw */
+} hc_listener_t;
+
+int hc_parse_listener(void *in, hc_listener_t *listener);
+
+int hc_listener_create(hc_sock_t *s, hc_listener_t *listener);
+// XXX int hc_listener_delete(hc_sock_t * s, hc_listener_t * listener);
+int hc_listener_list(hc_sock_t *s, hc_data_t **pdata);
+
+#define foreach_listener(VAR, data) foreach_type(hc_listener_t, VAR, data)
+
+#define MAXSZ_HC_LISTENER_ MAXSZ_HC_URL_ + SPACE + MAXSZ_HC_CONNECTION_TYPE_
+#define MAXSZ_HC_LISTENER MAXSZ_HC_LISTENER_ + NULLTERM
+
+int hc_listener_cmp(const hc_listener_t *l1, const hc_listener_t *l2);
+
+size_t hc_listener_snprintf(char *s, size_t size, hc_listener_t *listener);
+
+/*----------------------------------------------------------------------------*
+ * Connections
+ *----------------------------------------------------------------------------*/
+
+typedef struct {
+  u32 id;                    /* Kr. */
+  char name[NAME_LEN];       /* K.w */
+  hc_connection_type_t type; /* .rw */
+  int family;                /* .rw */
+  ip_address_t local_addr;   /* .rw */
+  u16 local_port;            /* .rw */
+  ip_address_t remote_addr;  /* .rw */
+  u16 remote_port;           /* .rw */
+#ifdef WITH_POLICY
+  face_state_t desired_state;  /* .rw */
+  face_tags_t tags;            /* .rw */
+#endif                         /* WITH_POLICY */
+  hc_connection_state_t state; /* .r. */
+} hc_connection_t;
+
+int hc_parse_connection(void *in, hc_connection_t *connection);
+
+int hc_connection_create(hc_sock_t *s, hc_connection_t *connection);
+int hc_connection_delete(hc_sock_t *s, hc_connection_t *connection);
+/*
+int hc_connection_remove_by_id(hc_sock_t * s, char * name);
+int hc_connection_remove_by_name(hc_sock_t * s, char * name);
+*/
+#ifdef WITH_POLICY
+int hc_connection_set_state(hc_sock_t *s, const char *conn_id_or_name,
+                            face_state_t state);
+#endif /* WITH_POLICY */
+int hc_connection_list(hc_sock_t *s, hc_data_t **pdata);
+
+#define foreach_connection(VAR, data) foreach_type(hc_connection_t, VAR, data)
+
+#define MAXSZ_HC_CONNECTION_                                                   \
+  MAXSZ_HC_CONNECTION_STATE_ + 2 * MAXSZ_HC_URL_ + MAXSZ_HC_CONNECTION_TYPE_ + \
+      SPACES(3)
+#define MAXSZ_HC_CONNECTION MAXSZ_HC_CONNECTION_ + NULLTERM
+
+size_t hc_connection_snprintf(char *s, size_t size,
+                              hc_connection_t *connection);
+
+/*----------------------------------------------------------------------------*
+ * Routes
+ *----------------------------------------------------------------------------*/
+
+typedef struct {
+  u8 conn_id;               /* Kr. */
+  char conn_name[NAME_LEN]; /* K.w */
+  int family;               /* Krw */
+  ip_address_t remote_addr; /* krw */
+  u8 len;                   /* krw */
+  u16 cost;                 /* .rw */
+} hc_route_t;
+
+int hc_parse_route(void *in, hc_route_t *route);
+
+int hc_route_create(hc_sock_t *s, hc_route_t *route);
+int hc_route_delete(hc_sock_t *s, hc_route_t *route);
+int hc_route_list(hc_sock_t *s, hc_data_t **pdata);
+
+#define foreach_route(VAR, data) foreach_type(hc_route_t, VAR, data)
+
+#define MAXSZ_HC_ROUTE_ 0
+#define MAXSZ_HC_ROUTE MAXSZ_HC_ROUTE_ + NULLTERM
+
+size_t hc_route_snprintf(char *s, size_t size, hc_route_t *route);
+
+/*----------------------------------------------------------------------------*
+ * Faces
+ *
+ * A face is an abstraction introduced by the control library to abstract the
+ * forwarder implementation details. It encompasses connections and listeners
+ * and ensures the right dependencies are enforced, eg that we always have a
+ * listener when a connection is created.
+ *
+ *----------------------------------------------------------------------------*/
+
+typedef struct {
+  u32 id;
+  char name[NAME_LEN];
+  face_t face;  // or embed ?
+                // face_id_t parent; /* Pointer from connection to listener */
+} hc_face_t;
+
+int hc_face_create(hc_sock_t *s, hc_face_t *face);
+int hc_face_delete(hc_sock_t *s, hc_face_t *face);
+int hc_face_list(hc_sock_t *s, hc_data_t **pdata);
+
+#define foreach_face(VAR, data) foreach_type(hc_face_t, VAR, data)
+
+#define MAXSZ_HC_FACE_ 0
+#define MAXSZ_HC_FACE MAXSZ_HC_FACE_ + NULLTERM
+
+size_t hc_face_snprintf(char *s, size_t size, hc_face_t *face);
+
+/*----------------------------------------------------------------------------*
+ * Cache
+ *----------------------------------------------------------------------------*/
+
+int hc_cache_set_store(hc_sock_t *s, int enabled);
+int hc_cache_set_serve(hc_sock_t *s, int enabled);
+
+/*----------------------------------------------------------------------------*
+ * Punting
+ *----------------------------------------------------------------------------*/
+
+int hc_punting_create(hc_sock_t *s /* XXX */);
+
+/*----------------------------------------------------------------------------*
+ * Strategy
+ *----------------------------------------------------------------------------*/
+
+// per prefix
+int hc_strategy_set(hc_sock_t *s /* XXX */);
+
+/*----------------------------------------------------------------------------*
+ * FIB
+ *----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*
+ * PIT
+ *----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*
+ * WLDR
+ *----------------------------------------------------------------------------*/
+
+// per connection
+int hc_wldr_set(hc_sock_t *s /* XXX */);
+
+/*----------------------------------------------------------------------------*
+ * MAP-Me
+ *----------------------------------------------------------------------------*/
+
+int hc_mapme_set(hc_sock_t *s, int enabled);
+int hc_mapme_set_discovery(hc_sock_t *s, int enabled);
+int hc_mapme_set_timescale(hc_sock_t *s, double timescale);
+int hc_mapme_set_retx(hc_sock_t *s, double timescale);
+
+#endif /* HICNTRL_API */
diff --git a/hicn-light/src/hicn/api/commands.h b/hicn-light/src/hicn/api/commands.h
new file mode 100644
index 000000000..c26ac0172
--- /dev/null
+++ b/hicn-light/src/hicn/api/commands.h
@@ -0,0 +1,357 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+/*
+ * @file commands.h
+ * @brief All hicn-light commands: 14 in total.
+ *
+ * Header and payload in binary format.
+ */
+
+#ifndef commands_h
+#define commands_h
+
+#ifndef _WIN32
+#include <netinet/in.h>
+#include <sys/socket.h>
+#endif
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef WITH_POLICY
+#include <hicn/api/face.h>
+#endif /* WITH_POLICY */
+
+typedef struct in6_addr ipv6_addr_t;
+typedef uint32_t ipv4_addr_t;
+
+union commandAddr {
+  ipv4_addr_t ipv4;
+  ipv6_addr_t ipv6;
+};
+
+typedef enum {
+  REQUEST_LIGHT = 0xc0,  // this is a command
+  RESPONSE_LIGHT,
+  ACK_LIGHT,
+  NACK_LIGHT,
+  LAST_MSG_TYPE_VALUE
+} message_type;
+
+typedef enum {
+  ADD_LISTENER = 0,
+  ADD_CONNECTION,
+  LIST_CONNECTIONS,
+  ADD_ROUTE,
+  LIST_ROUTES,
+  REMOVE_CONNECTION,
+  REMOVE_ROUTE,
+  CACHE_STORE,
+  CACHE_SERVE,
+  CACHE_CLEAR,
+  SET_STRATEGY,
+  SET_WLDR,
+  ADD_PUNTING,
+  LIST_LISTENERS,
+  MAPME_ENABLE,
+  MAPME_DISCOVERY,
+  MAPME_TIMESCALE,
+  MAPME_RETX,
+#ifdef WITH_POLICY
+  CONNECTION_SET_STATE,
+#endif /* WITH_POLICY */
+  LAST_COMMAND_VALUE
+} command_id;
+
+typedef enum {
+  ADDR_INET = 1,
+  ADDR_INET6,
+  ADDR_LINK,
+  ADDR_IFACE,
+  ADDR_UNIX /* PF_UNIX */
+} address_type;
+
+typedef enum {
+  UDP_CONN,
+  TCP_CONN,
+  GRE_CONN,  // not implemented
+  HICN_CONN
+} connection_type;
+
+typedef enum { ACTIVATE_ON, ACTIVATE_OFF } activate_type;
+
+//==========    HEADER    ==========
+
+typedef struct {
+  uint8_t messageType;
+  uint8_t commandID;
+  uint16_t length;  // tells the number of structures in the payload
+  uint32_t seqNum;
+} header_control_message;
+// for the moment has to be at least 8 bytes
+
+// SIZE=8
+
+//==========  [00]  ADD LISTENER    ==========
+
+typedef enum { ETHER_MODE, IP_MODE, HICN_MODE } listener_mode;
+
+typedef struct {
+  char symbolic[16];
+  // char interfaceName[16];
+  union commandAddr address;
+  uint16_t port;
+  // uint16_t etherType;
+  uint8_t addressType;
+  uint8_t listenerMode;
+  uint8_t connectionType;
+} add_listener_command;
+
+// SIZE=40
+
+//==========  [01]  ADD CONNECTION    ==========
+
+typedef struct {
+  char symbolic[16];
+  union commandAddr remoteIp;
+  union commandAddr localIp;
+  uint16_t remotePort;
+  uint16_t localPort;
+  uint8_t ipType;
+  uint8_t connectionType;
+#ifdef WITH_POLICY
+  face_state_t
+      desired_state; /* This is the desired state, not the actual state */
+  face_tags_t tags;
+#endif /* WITH_POLICY */
+} add_connection_command;
+
+// SIZE=56
+
+//==========  [02]  LIST CONNECTIONS    ==========
+
+typedef enum {
+  CONN_GRE,
+  CONN_TCP,
+  CONN_UDP,
+  CONN_MULTICAST,
+  CONN_L2,
+  CONN_HICN
+} list_connections_type;
+
+typedef enum {
+  IFACE_UP = 0,
+  IFACE_DOWN = 1,
+  IFACE_UNKNOWN = 2  // not used actually
+} connection_state;
+
+typedef struct {
+  add_connection_command connectionData;
+  uint32_t connid;
+  uint8_t state;
+} list_connections_command;
+
+// SIZE=64
+
+//==========  [03]  ADD ROUTE    ==========
+
+typedef struct {
+  char symbolicOrConnid[16];
+  union commandAddr address;
+  uint16_t cost;
+  uint8_t addressType;
+  uint8_t len;
+} add_route_command;
+
+// SIZE=36
+
+//==========  [04]  LIST ROUTE    ==========
+
+typedef struct {
+  union commandAddr address;
+  uint32_t connid;
+  uint16_t cost;
+  uint8_t addressType;
+  uint8_t len;
+} list_routes_command;
+
+// SIZE=24
+
+//==========  [05]  REMOVE CONNECTION    ==========
+
+typedef struct {
+  char symbolicOrConnid[16];
+} remove_connection_command;
+
+// SIZE=16
+
+//==========  [06]  REMOVE ROUTE    ==========
+
+typedef struct {
+  char symbolicOrConnid[16];
+  union commandAddr address;
+  uint8_t addressType;
+  uint8_t len;
+} remove_route_command;
+
+// SIZE=36
+
+//==========  [07]  CACHE STORE    ==========
+
+typedef struct {
+  uint8_t activate;
+} cache_store_command;
+
+// SIZE=1
+
+//==========  [08]  CACHE SERVE    ==========
+
+typedef struct {
+  uint8_t activate;
+} cache_serve_command;
+
+// SIZE=1
+
+//==========  [09]  SET STRATEGY    ==========
+
+typedef enum {
+  SET_STRATEGY_LOADBALANCER,
+  SET_STRATEGY_RANDOM,
+  SET_STRATEGY_RANDOM_PER_DASH_SEGMENT,
+  SET_STRATEGY_LOADBALANCER_WITH_DELAY,
+  SET_STRATEGY_LOADBALANCER_BY_RATE,
+  SET_STRATEGY_LOADBALANCER_BEST_ROUTE,
+  LAST_STRATEGY_VALUE
+} strategy_type;
+
+typedef struct {
+  union commandAddr address;
+  uint8_t strategyType;
+  uint8_t addressType;
+  uint8_t len;
+} set_strategy_command;
+
+// SIZE=20
+
+//==========  [11]  SET WLDR    ==========
+
+typedef struct {
+  char symbolicOrConnid[16];
+  uint8_t activate;
+} set_wldr_command;
+
+// SIZE=17
+
+//==========  [12]  ADD PUNTING    ==========
+
+typedef struct {
+  char symbolicOrConnid[16];
+  union commandAddr address;
+  uint8_t addressType;
+  uint8_t len;
+} add_punting_command;
+
+// SIZE=36
+
+//==========  [13]  LIST LISTENER    ==========
+
+typedef struct {
+  union commandAddr address;
+  uint32_t connid;
+  uint16_t port;
+  uint8_t addressType;
+  uint8_t encapType;
+} list_listeners_command;
+
+// SIZE=24
+
+//==========  [14]  MAPME    ==========
+
+//  (enable/discovery/timescale/retx)
+
+typedef struct {
+  uint8_t activate;
+} mapme_activator_command;
+
+// SIZE=1
+
+typedef struct {
+  uint32_t timePeriod;
+} mapme_timing_command;
+
+// SIZE=1
+
+//==========  POLICY-RELATED FUNCTIONS  ==========
+
+#ifdef WITH_POLICY
+typedef struct {
+  char symbolicOrConnid[16];
+  face_state_t state;
+} connection_set_state_command;
+#endif /* WITH_POLICY */
+
+//===== size of commands ======
+// REMINDER: when a new_command is added, the following switch has to be
+// updated.
+static inline int payloadLengthDaemon(command_id id) {
+  switch (id) {
+    case ADD_LISTENER:
+      return sizeof(add_listener_command);
+    case ADD_CONNECTION:
+      return sizeof(add_connection_command);
+    case LIST_CONNECTIONS:
+      return 0;  // list connections: payload always 0
+    case ADD_ROUTE:
+      return sizeof(add_route_command);
+    case LIST_ROUTES:
+      return 0;  // list routes: payload always 0
+    case REMOVE_CONNECTION:
+      return sizeof(remove_connection_command);
+    case REMOVE_ROUTE:
+      return sizeof(remove_route_command);
+    case CACHE_STORE:
+      return sizeof(cache_store_command);
+    case CACHE_SERVE:
+      return sizeof(cache_serve_command);
+    case CACHE_CLEAR:
+      return 0;  // cache clear
+    case SET_STRATEGY:
+      return sizeof(set_strategy_command);
+    case SET_WLDR:
+      return sizeof(set_wldr_command);
+    case ADD_PUNTING:
+      return sizeof(add_punting_command);
+    case LIST_LISTENERS:
+      return 0;  // list listeners: payload always 0
+    case MAPME_ENABLE:
+      return sizeof(mapme_activator_command);
+    case MAPME_DISCOVERY:
+      return sizeof(mapme_activator_command);
+    case MAPME_TIMESCALE:
+      return sizeof(mapme_timing_command);
+    case MAPME_RETX:
+      return sizeof(mapme_timing_command);
+#ifdef WITH_POLICY
+    case CONNECTION_SET_STATE:
+      return sizeof(connection_set_state_command);
+#endif /* WITH_POLICY */
+    case LAST_COMMAND_VALUE:
+      return 0;
+    default:
+      return 0;
+  }
+}
+#endif
diff --git a/hicn-light/src/hicn/api/face.h b/hicn-light/src/hicn/api/face.h
new file mode 100644
index 000000000..6caf8b9f7
--- /dev/null
+++ b/hicn-light/src/hicn/api/face.h
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+/**
+ * \file face.h
+ * \brief Face abstraction
+ */
+#ifndef HICN_FACE_H
+#define HICN_FACE_H
+
+#ifndef SPACES
+#define SPACES(x) x
+#endif
+#ifndef SPACE
+#define SPACE 1
+#endif
+#ifndef NULLTERM
+#define NULLTERM 1
+#endif
+
+#include <hicn/api/ip_address.h>
+#include <hicn/api/types.h>
+
+/* Netdevice type */
+
+#include <net/if.h>  // IFNAMSIZ
+
+#define foreach_netdevice_type \
+  _(UNDEFINED)                 \
+  _(WIRED)                     \
+  _(WIFI)                      \
+  _(CELLULAR)                  \
+  _(VPN)                       \
+  _(N)
+
+#define MAXSZ_NETDEVICE_TYPE_ 9
+#define MAXSZ_NETDEVICE_TYPE MAXSZ_NETDEVICE_TYPE_ + NULLTERM
+
+typedef enum {
+#define _(x) x,
+  foreach_netdevice_type
+#undef _
+} netdevice_type_t;
+
+extern const char* netdevice_type_str[];
+
+/* Netdevice */
+
+typedef struct {
+  u32 index;
+  char name[IFNAMSIZ];
+} netdevice_t;
+
+#define NETDEVICE_UNDEFINED_INDEX 0
+
+/* Face state */
+
+#define foreach_face_state \
+  _(UNDEFINED)             \
+  _(PENDING_UP)            \
+  _(UP)                    \
+  _(PENDING_DOWN)          \
+  _(DOWN)                  \
+  _(ERROR)                 \
+  _(N)
+
+#define MAXSZ_FACE_STATE_ 12
+#define MAXSZ_FACE_STATE MAXSZ_FACE_STATE_ + 1
+
+typedef enum {
+#define _(x) FACE_STATE_##x,
+  foreach_face_state
+#undef _
+} face_state_t;
+
+extern const char* face_state_str[];
+
+/* Face type */
+
+#define foreach_face_type \
+  _(UNDEFINED)            \
+  _(HICN)                 \
+  _(HICN_LISTENER)        \
+  _(TCP)                  \
+  _(TCP_LISTENER)         \
+  _(UDP)                  \
+  _(UDP_LISTENER)         \
+  _(N)
+
+#define MAXSZ_FACE_TYPE_ 13
+#define MAXSZ_FACE_TYPE MAXSZ_FACE_TYPE_ + 1
+
+typedef enum {
+#define _(x) FACE_TYPE_##x,
+  foreach_face_type
+#undef _
+} face_type_t;
+
+extern const char* face_type_str[];
+
+#define MAXSZ_FACE_ MAXSZ_FACE_TYPE_ + 2 * MAXSZ_IP_ADDRESS + 2 * MAXSZ_PORT + 9
+#define MAXSZ_FACE MAXSZ_FACE_ + 1
+
+/* Face tag */
+
+/**
+ * \brief Tags associated to faces, useful to implement policies.
+ *
+ * NOTE
+ *  - These tags should be shared with the forwarder, and might in fact be
+ *  defined in a common library.
+ *  - We start with a very simple implementation where all tags are not
+ *  categorized and stored within the same bitfield.
+ */
+#define foreach_face_tag    \
+  _(UNDEFINED)              \
+  /* Connection type */     \
+  _(WIRED)                  \
+  _(WIFI)                   \
+  _(LTE)                    \
+  _(VPN)                    \
+  /* Connection security */ \
+  _(TRUSTED_NETWORK)        \
+  _(UNTRUSTED_NETWORK)      \
+  _(N)
+
+#define MAXSZ_FACE_TAG_ 17
+#define MAXSZ_FACE_TAG MAXSZ_FACE_TAG_ + 1
+
+typedef enum {
+#define _(x) FACE_TAG_##x,
+  foreach_face_tag
+#undef _
+} face_tag_t;
+
+extern const char* face_tag_str[];
+
+typedef int face_tags_t;
+
+static inline void face_tags_add(face_tags_t* tags, face_tag_t tag) {
+  *tags |= tag;
+}
+
+static inline void face_tags_remove(face_tags_t* tags, face_tag_t tag) {
+  *tags &= ~tag;
+}
+
+static inline int face_tags_has(face_tags_t tags, face_tag_t tag) {
+  return tags & tag;
+}
+
+#define FACE_TAGS_EMPTY 0
+
+/* Face */
+
+typedef struct {
+  face_type_t type;
+  union {
+    struct {
+      int family;
+      netdevice_t netdevice;
+      ip_address_t local_addr;
+      ip_address_t remote_addr;
+    } hicn;
+    struct {
+      int family;
+      ip_address_t local_addr;
+      u16 local_port;
+      ip_address_t remote_addr;
+      u16 remote_port;
+    } tunnel;
+  };
+  int tags; /**< \see face_tag_t */
+} face_t;
+
+int face_initialize(face_t* face);
+int face_initialize_udp(face_t* face, const ip_address_t* local_addr,
+                        u16 local_port, const ip_address_t* remote_addr,
+                        u16 remote_port, int family);
+face_t* face_initialize_udp_sa(face_t* face, const struct sockaddr* local_addr,
+                               const struct sockaddr* remote_addr);
+
+face_t* face_create();
+face_t* face_create_udp(const ip_address_t* local_addr, u16 local_port,
+                        const ip_address_t* remote_addr, u16 remote_port,
+                        int family);
+face_t* face_create_udp_sa(const struct sockaddr* local_addr,
+                           const struct sockaddr* remote_addr);
+
+int face_finalize(face_t* face);
+
+void face_free(face_t* face);
+
+typedef bool (*face_cmp_t)(const face_t* f1, const face_t* f2);
+
+bool face_cmp(const face_t* f1, const face_t* f2);
+hash_t face_hash(const face_t* face);
+
+size_t face_snprintf(char* s, size_t size, const face_t* face);
+
+#endif /* HICN_FACE_H */
diff --git a/hicn-light/src/hicn/api/fib_policy.h b/hicn-light/src/hicn/api/fib_policy.h
new file mode 100644
index 000000000..f5f82295d
--- /dev/null
+++ b/hicn-light/src/hicn/api/fib_policy.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+/**
+ * \file fib_policy.h
+ * \brief FIB policy description to be stored in FIB entries.
+ */
+#ifndef HICN_FIB_POLICY_H
+#define HICN_FIB_POLICY_H
+
+#include <hicn/api/face.h>
+
+typedef struct {
+  face_tags_t allow;
+  face_tags_t prohibit;
+  face_tags_t prefer;
+  face_tags_t avoid;
+} fib_policy_t;
+
+static const fib_policy_t FIB_POLICY_NONE = {
+    .allow = FACE_TAGS_EMPTY,
+    .prohibit = FACE_TAGS_EMPTY,
+    .prefer = FACE_TAGS_EMPTY,
+    .avoid = FACE_TAGS_EMPTY,
+};
+
+#endif /* HICN_FIB_POLICY_H */
diff --git a/hicn-light/src/hicn/api/ip_address.h b/hicn-light/src/hicn/api/ip_address.h
new file mode 100644
index 000000000..b58981d85
--- /dev/null
+++ b/hicn-light/src/hicn/api/ip_address.h
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+/**
+ * \file ip_address.h
+ * \brief IP address type support
+ */
+#ifndef IP_ADDRESS_H
+#define IP_ADDRESS_H
+
+#include <arpa/inet.h>  // inet_ntop
+#ifdef __APPLE__
+#include <libkern/OSByteOrder.h>
+#define __bswap_constant_32(x) OSSwapInt32(x)
+#include <machine/endian.h>
+#else
+#include <endian.h>
+#endif
+#include <errno.h>
+#include <netdb.h>       // struct addrinfo
+#include <netinet/in.h>  // INET*_ADDRSTRLEN, IN*ADDR_LOOPBACK
+#include <stdlib.h>
+#include <string.h>  // memset
+
+#include <hicn/api/types.h>
+
+#define bytes_to_bits(x) (x * 8)
+#define IPV6_ADDR_LEN 16 /* bytes */
+#define IPV4_ADDR_LEN 4  /* bytes */
+#define IPV6_ADDR_LEN_BITS bytes_to_bits(IPV6_ADDR_LEN)
+#define IPV4_ADDR_LEN_BITS bytes_to_bits(IPV4_ADDR_LEN)
+
+#define IP_MAX_ADDR_LEN IPV6_ADDR_LEN
+
+#define DUMMY_PORT 1234
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef union {
+  union {
+    struct in_addr as_inaddr;
+    u8 as_u8[4];
+    u16 as_u16[2];
+    u32 as_u32;
+  } v4;
+  union {
+    struct in6_addr as_in6addr;
+    u8 as_u8[16];
+    u16 as_u16[8];
+    u32 as_u32[4];
+    u64 as_u64[2];
+  } v6;
+  u8 buffer[IP_MAX_ADDR_LEN];
+  u8 as_u8[IP_MAX_ADDR_LEN];
+  u16 as_u16[IP_MAX_ADDR_LEN >> 1];
+  u32 as_u32[IP_MAX_ADDR_LEN >> 2];
+  u64 as_u64[IP_MAX_ADDR_LEN >> 3];
+} ip_address_t;
+
+#define MAXSZ_IP4_ADDRESS_ INET_ADDRSTRLEN - 1
+#define MAXSZ_IP6_ADDRESS_ INET6_ADDRSTRLEN - 1
+#define MAXSZ_IP_ADDRESS_ MAXSZ_IP6_ADDRESS_
+#define MAXSZ_IP4_ADDRESS MAXSZ_IP4_ADDRESS_ + 1
+#define MAXSZ_IP6_ADDRESS MAXSZ_IP6_ADDRESS_ + 1
+#define MAXSZ_IP_ADDRESS MAXSZ_IP_ADDRESS_ + 1
+
+/* No htonl() with const */
+static const ip_address_t IPV4_LOOPBACK = {
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+    .v4.as_inaddr.s_addr = __bswap_constant_32(INADDR_LOOPBACK),
+#else
+    .v4.as_inaddr.s_addr = INADDR_LOOPBACK,
+#endif
+};
+
+static const ip_address_t IPV6_LOOPBACK = {
+    .v6.as_in6addr = IN6ADDR_LOOPBACK_INIT,
+};
+
+#define MAX_PORT 1 << (8 * sizeof(u16))
+#define IS_VALID_PORT(x) ((x > 0) && (x < MAX_PORT))
+
+#define MAXSZ_PORT_ 5
+#define MAXSZ_PORT MAXSZ_PORT_ + 1
+
+#define IS_VALID_FAMILY(x) ((x == AF_INET) || (x == AF_INET6))
+
+static inline int ip_address_get_family(const char *ip_address) {
+  struct addrinfo hint, *res = NULL;
+  int rc;
+
+  memset(&hint, '\0', sizeof hint);
+
+  hint.ai_family = PF_UNSPEC;
+  hint.ai_flags = AI_NUMERICHOST;
+
+  rc = getaddrinfo(ip_address, NULL, &hint, &res);
+  if (rc) {
+    return -1;
+  }
+  rc = res->ai_family;
+  freeaddrinfo(res);
+  return rc;
+}
+
+static inline int ip_address_len(const ip_address_t *ip_address, int family) {
+  return (family == AF_INET6) ? IPV6_ADDR_LEN
+                              : (family == AF_INET) ? IPV4_ADDR_LEN : 0;
+}
+
+static inline int ip_address_ntop(const ip_address_t *ip_address, char *dst,
+                                  const size_t len, int family) {
+  const char *s = inet_ntop(family, ip_address->buffer, dst, len);
+  return (s ? 1 : -1);
+}
+
+/*
+ * Parse ip addresses in presentation format, or prefixes (in bits, separated by
+ * a slash)
+ */
+static inline int ip_address_pton(const char *ip_address_str,
+                                  ip_address_t *ip_address) {
+  int pton_fd;
+#ifdef IP_ADDRESS_PREFIX
+  char *p;
+  char *eptr;
+  u32 dst_len;
+#endif /* IP_ADDRESS_PREFIX */
+  char *addr = strdup(ip_address_str);
+  int family;
+
+#ifdef IP_ADDRESS_PREFIX
+  p = strchr(addr, '/');
+  if (!p) {
+    dst_len = 0;  // until we get the ip address family
+  } else {
+    dst_len = strtoul(p + 1, &eptr, 10);
+    *p = 0;
+  }
+#endif /* IP_ADDRESS_PREFIX */
+
+  family = ip_address_get_family(addr);
+
+  switch (family) {
+    case AF_INET6:
+#ifdef IP_ADDRESS_PREFIX
+      if (dst_len > IPV6_ADDR_LEN_BITS) goto ERR;
+#endif /* IP_ADDRESS_PREFIX */
+      pton_fd = inet_pton(AF_INET6, addr, &ip_address->buffer);
+      break;
+    case AF_INET:
+#ifdef IP_ADDRESS_PREFIX
+      if (dst_len > IPV4_ADDR_LEN_BITS) goto ERR;
+#endif /* IP_ADDRESS_PREFIX */
+      pton_fd = inet_pton(AF_INET, addr, &ip_address->buffer);
+      break;
+    default:
+      goto ERR;
+  }
+
+  //   0 = not in presentation format
+  // < 0 = other error (use perror)
+  if (pton_fd <= 0) {
+    goto ERR;
+  }
+
+  return 1;
+ERR:
+  free(addr);
+  return -1;
+}
+
+static inline int ip_address_snprintf(char *s, size_t size,
+                                      const ip_address_t *ip_address,
+                                      int family) {
+  size_t len = family == AF_INET ? INET_ADDRSTRLEN : INET6_ADDRSTRLEN;
+  const char *rc = inet_ntop(family, ip_address->buffer, s, len);
+  return rc ? strlen(rc) : -1;
+}
+
+static inline int ip_address_to_sockaddr(const ip_address_t *ip_address,
+                                         struct sockaddr *sockaddr_address,
+                                         int family) {
+  struct sockaddr_in6 *tmp6 = (struct sockaddr_in6 *)sockaddr_address;
+  struct sockaddr_in *tmp4 = (struct sockaddr_in *)sockaddr_address;
+
+  switch (family) {
+    case AF_INET6:
+      tmp6->sin6_family = AF_INET6;
+      tmp6->sin6_port = DUMMY_PORT;
+      tmp6->sin6_scope_id = 0;
+      memcpy(&tmp6->sin6_addr, ip_address->buffer, IPV6_ADDR_LEN);
+      break;
+    case AF_INET:
+      tmp4->sin_family = AF_INET;
+      tmp4->sin_port = DUMMY_PORT;
+      memcpy(&tmp4->sin_addr, ip_address->buffer, IPV4_ADDR_LEN);
+      break;
+    default:
+      return -1;
+  }
+
+  return 1;
+}
+
+#endif /* IP_ADDRESS_H */
diff --git a/hicn-light/src/hicn/api/token.h b/hicn-light/src/hicn/api/token.h
new file mode 100644
index 000000000..0c5541ba8
--- /dev/null
+++ b/hicn-light/src/hicn/api/token.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * 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.
+ */
+/* Token concatenation */
+
+/*
+ * Concatenate preprocessor tokens A and B without expanding macro definitions
+ * (however, if invoked from a macro, macro arguments are expanded).
+ */
+#define PPCAT_NX(A, B) A##B
+
+/*
+ * Concatenate preprocessor tokens A and B after macro-expanding them.
+ */
+#define PPCAT(A, B) PPCAT_NX(A, B)
+
+/* Token stringification */
+
+/*
+ * Turn A into a string literal without expanding macro definitions
+ * (however, if invoked from a macro, macro arguments are expanded).
+ */
+#define STRINGIZE_NX(A) #A
+
+/*
+ * Turn A into a string literal after macro-expanding it.
+ */
+#define STRINGIZE(A) STRINGIZE_NX(A)
diff --git a/hicn-light/src/hicn/api/types.h b/hicn-light/src/hicn/api/types.h
new file mode 100644
index 000000000..1efab5e77
--- /dev/null
+++ b/hicn-light/src/hicn/api/types.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * 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 TYPES
+#define TYPES
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+/* Helper for avoiding warnings about type-punning */
+#define UNION_CAST(x, destType) \
+  (((union {                    \
+     __typeof__(x) a;           \
+     destType b;                \
+   })x)                         \
+       .b)
+
+typedef unsigned int hash_t;
+
+typedef int (*cmp_t)(const void *, const void *);
+
+/* Enums */
+
+#define IS_VALID_ENUM_TYPE(NAME, x) ((x > NAME##_UNDEFINED) && (x < NAME##_N))
+
+#endif /* TYPES */
diff --git a/hicn-light/src/command_line/CMakeLists.txt b/hicn-light/src/hicn/command_line/CMakeLists.txt
index 16c23dc5c..16c23dc5c 100644
--- a/hicn-light/src/command_line/CMakeLists.txt
+++ b/hicn-light/src/hicn/command_line/CMakeLists.txt
diff --git a/hicn-light/src/command_line/controller/CMakeLists.txt b/hicn-light/src/hicn/command_line/controller/CMakeLists.txt
index b53e610a1..b53e610a1 100644
--- a/hicn-light/src/command_line/controller/CMakeLists.txt
+++ b/hicn-light/src/hicn/command_line/controller/CMakeLists.txt
diff --git a/hicn-light/src/command_line/controller/hicnLightControl_main.c b/hicn-light/src/hicn/command_line/controller/hicnLightControl_main.c
index b43789fe5..9ba155ede 100644
--- a/hicn-light/src/command_line/controller/hicnLightControl_main.c
+++ b/hicn-light/src/hicn/command_line/controller/hicnLightControl_main.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #ifndef _WIN32
 #include <arpa/inet.h>
@@ -39,14 +39,14 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_SafeMemory.h>
 
-#include <src/core/dispatcher.h>
-#include <src/core/forwarder.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/core/forwarder.h>
 
 #include <errno.h>
-#include <src/config/controlRoot.h>
-#include <src/config/controlState.h>
+#include <hicn/config/controlRoot.h>
+#include <hicn/config/controlState.h>
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 size_t commandOutputLen = 0;  // preserve the number of structs composing
                               // payload in case on not interactive call.
diff --git a/hicn-light/src/command_line/daemon/CMakeLists.txt b/hicn-light/src/hicn/command_line/daemon/CMakeLists.txt
index fd6cc9310..fd6cc9310 100644
--- a/hicn-light/src/command_line/daemon/CMakeLists.txt
+++ b/hicn-light/src/hicn/command_line/daemon/CMakeLists.txt
diff --git a/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c b/hicn-light/src/hicn/command_line/daemon/hicnLightDaemon_main.c
index 14192618b..f1841274b 100644
--- a/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c
+++ b/hicn-light/src/hicn/command_line/daemon/hicnLightDaemon_main.c
@@ -18,7 +18,7 @@
 #endif
 #include <errno.h>
 #include <fcntl.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -33,8 +33,8 @@
 
 #include <parc/assert/parc_Assert.h>
 
-#include <src/core/dispatcher.h>
-#include <src/core/forwarder.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/core/forwarder.h>
 
 static void _printRed(const char *output) {
 #ifndef _WIN32
diff --git a/hicn-light/src/config.h.in b/hicn-light/src/hicn/config.h.in
index 8b763df40..90ab8e83f 100644
--- a/hicn-light/src/config.h.in
+++ b/hicn-light/src/hicn/config.h.in
@@ -4,6 +4,6 @@
 #ifndef _WIN32
 #define _GNU_SOURCE
 #else
-#include <src/platforms/windows/win_portability.h>
+#include <hicn/platforms/windows/win_portability.h>
 #endif
 
diff --git a/hicn-light/src/config/CMakeLists.txt b/hicn-light/src/hicn/config/CMakeLists.txt
index 5ce680bfc..5ce680bfc 100644
--- a/hicn-light/src/config/CMakeLists.txt
+++ b/hicn-light/src/hicn/config/CMakeLists.txt
diff --git a/hicn-light/src/config/commandOps.c b/hicn-light/src/hicn/config/commandOps.c
index 28d3369e1..2081782bc 100644
--- a/hicn-light/src/config/commandOps.c
+++ b/hicn-light/src/hicn/config/commandOps.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -32,8 +32,8 @@ extern int errno;
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config/commandOps.h>
-#include <src/config/commandParser.h>
+#include <hicn/config/commandOps.h>
+#include <hicn/config/commandParser.h>
 
 CommandOps *commandOps_Create(void *closure, const char *command,
                               void (*init)(CommandParser *parser,
diff --git a/hicn-light/src/config/commandOps.h b/hicn-light/src/hicn/config/commandOps.h
index 6428a3ebf..0d685f1b8 100644
--- a/hicn-light/src/config/commandOps.h
+++ b/hicn-light/src/hicn/config/commandOps.h
@@ -27,7 +27,7 @@
 
 #include <parc/algol/parc_List.h>
 
-#include <src/config/commandReturn.h>
+#include <hicn/config/commandReturn.h>
 
 // forward reference
 struct command_parser;
diff --git a/hicn-light/src/config/commandParser.c b/hicn-light/src/hicn/config/commandParser.c
index 9759d2e37..38b017835 100644
--- a/hicn-light/src/config/commandParser.c
+++ b/hicn-light/src/hicn/config/commandParser.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <parc/assert/parc_Assert.h>
 #include <stdbool.h>
@@ -29,7 +29,7 @@
 #include <parc/algol/parc_Time.h>
 #include <parc/algol/parc_TreeRedBlack.h>
 
-#include <src/config/commandParser.h>
+#include <hicn/config/commandParser.h>
 
 #ifndef __ANDROID__
 #ifdef HAVE_ERRNO_H
diff --git a/hicn-light/src/config/commandParser.h b/hicn-light/src/hicn/config/commandParser.h
index 78e19e6e3..0bd2ee7b0 100644
--- a/hicn-light/src/config/commandParser.h
+++ b/hicn-light/src/hicn/config/commandParser.h
@@ -28,8 +28,8 @@
 #ifndef command_parser_h
 #define command_parser_h
 
-#include <src/config/commandOps.h>
-#include <src/config/commandReturn.h>
+#include <hicn/config/commandOps.h>
+#include <hicn/config/commandReturn.h>
 
 struct command_parser;
 typedef struct command_parser CommandParser;
diff --git a/hicn-light/src/config/commandReturn.h b/hicn-light/src/hicn/config/commandReturn.h
index 16ee93db1..16ee93db1 100644
--- a/hicn-light/src/config/commandReturn.h
+++ b/hicn-light/src/hicn/config/commandReturn.h
diff --git a/hicn-light/src/config/configuration.c b/hicn-light/src/hicn/config/configuration.c
index 3d25e425d..6c64fb1c1 100644
--- a/hicn-light/src/config/configuration.c
+++ b/hicn-light/src/hicn/config/configuration.c
@@ -27,7 +27,7 @@
 #endif
 #include <ctype.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,30 +36,30 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_String.h>
 
-#include <src/config/configurationListeners.h>
-#include <src/config/symbolicNameTable.h>
+#include <hicn/config/configurationListeners.h>
+#include <hicn/config/symbolicNameTable.h>
 
-#include <src/core/connection.h>
-#include <src/core/connectionTable.h>
-#include <src/core/forwarder.h>
-#include <src/core/system.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/connectionTable.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/system.h>
 #ifdef WITH_MAPME
-#include <src/core/mapMe.h>
+#include <hicn/core/mapMe.h>
 #endif /* WITH_MAPME */
 
-#include <src/io/streamConnection.h>
+#include <hicn/io/streamConnection.h>
 
-#include <src/io/hicnTunnel.h>
-#include <src/io/tcpTunnel.h>
-#include <src/io/udpTunnel.h>
+#include <hicn/io/hicnTunnel.h>
+#include <hicn/io/tcpTunnel.h>
+#include <hicn/io/udpTunnel.h>
 
 #include <parc/algol/parc_Unsigned.h>
-#include <src/io/listener.h>     //the listener list
-#include <src/io/listenerSet.h>  //   needed to print
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/io/listener.h>     //the listener list
+#include <hicn/io/listenerSet.h>  //   needed to print
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 #define ETHERTYPE 0x0801
 
diff --git a/hicn-light/src/config/configuration.h b/hicn-light/src/hicn/config/configuration.h
index 4dfcb0d16..5090f1413 100644
--- a/hicn-light/src/config/configuration.h
+++ b/hicn-light/src/hicn/config/configuration.h
@@ -26,8 +26,8 @@
 #ifndef configuration_h
 #define configuration_h
 
-#include <src/core/logger.h>
-#include <src/utils/commands.h>
+#include <hicn/core/logger.h>
+#include <hicn/utils/commands.h>
 
 struct configuration;
 typedef struct configuration Configuration;
diff --git a/hicn-light/src/config/configurationFile.c b/hicn-light/src/hicn/config/configurationFile.c
index 3facf5afe..f1991897f 100644
--- a/hicn-light/src/config/configurationFile.c
+++ b/hicn-light/src/hicn/config/configurationFile.c
@@ -18,7 +18,7 @@
 #endif
 #include <ctype.h>
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -27,10 +27,10 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Object.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config/configuration.h>
-#include <src/config/configurationFile.h>
-#include <src/config/controlRoot.h>
-#include <src/config/controlState.h>
+#include <hicn/config/configuration.h>
+#include <hicn/config/configurationFile.h>
+#include <hicn/config/controlRoot.h>
+#include <hicn/config/controlState.h>
 
 struct configuration_file {
   Forwarder *forwarder;
diff --git a/hicn-light/src/config/configurationFile.h b/hicn-light/src/hicn/config/configurationFile.h
index 54548191d..b748dfc15 100644
--- a/hicn-light/src/config/configurationFile.h
+++ b/hicn-light/src/hicn/config/configurationFile.h
@@ -27,7 +27,7 @@
 #ifndef configurationFile_h
 #define configurationFile_h
 
-#include <src/core/forwarder.h>
+#include <hicn/core/forwarder.h>
 
 struct configuration_file;
 typedef struct configuration_file ConfigurationFile;
diff --git a/hicn-light/src/config/configurationListeners.c b/hicn-light/src/hicn/config/configurationListeners.c
index 8a3ecddfc..a8dc09201 100644
--- a/hicn-light/src/config/configurationListeners.c
+++ b/hicn-light/src/hicn/config/configurationListeners.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #endif
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,19 +26,19 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
 
-#include <src/core/system.h>
-#include <src/utils/interfaceSet.h>
-#include <src/utils/punting.h>
+#include <hicn/core/system.h>
+#include <hicn/utils/interfaceSet.h>
+#include <hicn/utils/punting.h>
 
-#include <src/config/configurationListeners.h>
-#include <src/io/hicnListener.h>
-#include <src/io/tcpListener.h>
-#include <src/io/udpListener.h>
+#include <hicn/config/configurationListeners.h>
+#include <hicn/io/hicnListener.h>
+#include <hicn/io/tcpListener.h>
+#include <hicn/io/udpListener.h>
 
-#include <src/utils/address.h>
-#include <src/utils/addressList.h>
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/address.h>
+#include <hicn/utils/addressList.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static bool _setupHicnListenerOnInet4(Forwarder *forwarder,
                                       const char *symbolic, Address *address) {
diff --git a/hicn-light/src/config/configurationListeners.h b/hicn-light/src/hicn/config/configurationListeners.h
index 25d40e27e..b09ad5167 100644
--- a/hicn-light/src/config/configurationListeners.h
+++ b/hicn-light/src/hicn/config/configurationListeners.h
@@ -24,10 +24,10 @@
 #ifndef configurationListeners_h
 #define configurationListeners_h
 
-#include <src/config/configuration.h>
-#include <src/core/forwarder.h>
+#include <hicn/config/configuration.h>
+#include <hicn/core/forwarder.h>
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 /**
  * Setup udp, tcp, and local listeners
diff --git a/hicn-light/src/config/controlAdd.c b/hicn-light/src/hicn/config/controlAdd.c
index 7feee98ad..f77897dc4 100644
--- a/hicn-light/src/config/controlAdd.c
+++ b/hicn-light/src/hicn/config/controlAdd.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <parc/assert/parc_Assert.h>
 #include <stdbool.h>
@@ -23,11 +23,11 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlAdd.h>
-#include <src/config/controlAddConnection.h>
-#include <src/config/controlAddListener.h>
-#include <src/config/controlAddPunting.h>
-#include <src/config/controlAddRoute.h>
+#include <hicn/config/controlAdd.h>
+#include <hicn/config/controlAddConnection.h>
+#include <hicn/config/controlAddListener.h>
+#include <hicn/config/controlAddPunting.h>
+#include <hicn/config/controlAddRoute.h>
 
 // ===================================================
 
diff --git a/hicn-light/src/config/controlAdd.h b/hicn-light/src/hicn/config/controlAdd.h
index e1955f200..7c160b5f7 100644
--- a/hicn-light/src/config/controlAdd.h
+++ b/hicn-light/src/hicn/config/controlAdd.h
@@ -25,7 +25,7 @@
 #ifndef control_Add_h
 #define control_Add_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 
 CommandOps *webControlAdd_Create(ControlState *state);
 CommandOps *controlAdd_CreateHelp(ControlState *state);
diff --git a/hicn-light/src/config/controlAddConnection.c b/hicn-light/src/hicn/config/controlAddConnection.c
index 7a95e5d91..813c40929 100644
--- a/hicn-light/src/config/controlAddConnection.c
+++ b/hicn-light/src/hicn/config/controlAddConnection.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <ctype.h>
 #include <parc/assert/parc_Assert.h>
@@ -25,10 +25,10 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
 
-#include <src/config/controlAddConnection.h>
+#include <hicn/config/controlAddConnection.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 // ===================================================
 
diff --git a/hicn-light/src/config/controlAddConnection.h b/hicn-light/src/hicn/config/controlAddConnection.h
index 788306989..546388efc 100644
--- a/hicn-light/src/config/controlAddConnection.h
+++ b/hicn-light/src/hicn/config/controlAddConnection.h
@@ -25,7 +25,7 @@
 #ifndef controlAddConnection_h
 #define controlAddConnection_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlAddConnection_Create(ControlState *state);
 CommandOps *controlAddConnection_HelpCreate(ControlState *state);
 #endif  // controlAddConnection_h
diff --git a/hicn-light/src/config/controlAddListener.c b/hicn-light/src/hicn/config/controlAddListener.c
index 2cabfd035..48ea02e68 100644
--- a/hicn-light/src/config/controlAddListener.c
+++ b/hicn-light/src/hicn/config/controlAddListener.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <ctype.h>
 #include <inttypes.h>
@@ -27,10 +27,10 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
 
-#include <src/config/controlAddListener.h>
+#include <hicn/config/controlAddListener.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlAddListener_Execute(CommandParser *parser,
                                                  CommandOps *ops,
diff --git a/hicn-light/src/config/controlAddListener.h b/hicn-light/src/hicn/config/controlAddListener.h
index d3fc55aaf..6516d1779 100644
--- a/hicn-light/src/config/controlAddListener.h
+++ b/hicn-light/src/hicn/config/controlAddListener.h
@@ -24,7 +24,7 @@
 #ifndef Control_AddListener_h
 #define Control_AddListener_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlAddListener_Create(ControlState *state);
 CommandOps *controlAddListener_HelpCreate(ControlState *state);
 #endif  // Control_AddListener_h
diff --git a/hicn-light/src/config/controlAddPunting.c b/hicn-light/src/hicn/config/controlAddPunting.c
index 13d00b7e0..c86901089 100644
--- a/hicn-light/src/config/controlAddPunting.c
+++ b/hicn-light/src/hicn/config/controlAddPunting.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <ctype.h>
 #include <stdbool.h>
@@ -25,12 +25,12 @@
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
-#include <src/utils/punting.h>
+#include <hicn/utils/punting.h>
 
-#include <src/config/controlAddPunting.h>
+#include <hicn/config/controlAddPunting.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlAddPunting_Execute(CommandParser *parser,
                                                 CommandOps *ops,
diff --git a/hicn-light/src/config/controlAddPunting.h b/hicn-light/src/hicn/config/controlAddPunting.h
index e4d4aac7e..9cab76359 100644
--- a/hicn-light/src/config/controlAddPunting.h
+++ b/hicn-light/src/hicn/config/controlAddPunting.h
@@ -16,7 +16,7 @@
 #ifndef controlAddPunting_h
 #define controlAddPunting_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlAddPunting_Create(ControlState *state);
 CommandOps *controlAddPunting_HelpCreate(ControlState *state);
 #endif
diff --git a/hicn-light/src/config/controlAddRoute.c b/hicn-light/src/hicn/config/controlAddRoute.c
index 27aae4019..f1c85e29a 100644
--- a/hicn-light/src/config/controlAddRoute.c
+++ b/hicn-light/src/hicn/config/controlAddRoute.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <ctype.h>
 #include <stdbool.h>
@@ -26,10 +26,10 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
 
-#include <src/config/controlAddRoute.h>
+#include <hicn/config/controlAddRoute.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlAddRoute_Execute(CommandParser *parser,
                                               CommandOps *ops, PARCList *args);
diff --git a/hicn-light/src/config/controlAddRoute.h b/hicn-light/src/hicn/config/controlAddRoute.h
index be0ad1368..9588c0f42 100644
--- a/hicn-light/src/config/controlAddRoute.h
+++ b/hicn-light/src/hicn/config/controlAddRoute.h
@@ -24,7 +24,7 @@
 #ifndef Control_AddRoute_h
 #define Control_AddRoute_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlAddRoute_Create(ControlState *state);
 CommandOps *controlAddRoute_HelpCreate(ControlState *state);
 #endif  // Control_AddRoute_h
diff --git a/hicn-light/src/config/controlCache.c b/hicn-light/src/hicn/config/controlCache.c
index e8d19e828..fa228994c 100644
--- a/hicn-light/src/config/controlCache.c
+++ b/hicn-light/src/hicn/config/controlCache.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -26,10 +26,10 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlCache.h>
-#include <src/config/controlCacheClear.h>
-#include <src/config/controlCacheServe.h>
-#include <src/config/controlCacheStore.h>
+#include <hicn/config/controlCache.h>
+#include <hicn/config/controlCacheClear.h>
+#include <hicn/config/controlCacheServe.h>
+#include <hicn/config/controlCacheStore.h>
 
 static void _controlCache_Init(CommandParser *parser, CommandOps *ops);
 static CommandReturn _controlCache_Execute(CommandParser *parser,
diff --git a/hicn-light/src/config/controlCache.h b/hicn-light/src/hicn/config/controlCache.h
index a3614fce1..c2f2402f1 100644
--- a/hicn-light/src/config/controlCache.h
+++ b/hicn-light/src/hicn/config/controlCache.h
@@ -16,7 +16,7 @@
 #ifndef controlCache_h
 #define controlCache_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlCache_Create(ControlState *state);
 CommandOps *controlCache_HelpCreate(ControlState *state);
 #endif  // controlCache_h
diff --git a/hicn-light/src/config/controlCacheClear.c b/hicn-light/src/hicn/config/controlCacheClear.c
index 2679f368e..be9a4ac38 100644
--- a/hicn-light/src/config/controlCacheClear.c
+++ b/hicn-light/src/hicn/config/controlCacheClear.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -24,10 +24,10 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlCacheClear.h>
+#include <hicn/config/controlCacheClear.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlCacheClear_Execute(CommandParser *parser,
                                                 CommandOps *ops,
diff --git a/hicn-light/src/config/controlCacheClear.h b/hicn-light/src/hicn/config/controlCacheClear.h
index 348ddba12..025758c34 100644
--- a/hicn-light/src/config/controlCacheClear.h
+++ b/hicn-light/src/hicn/config/controlCacheClear.h
@@ -24,7 +24,7 @@
 #ifndef Control_CacheClear_h
 #define Control_CacheClear_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlCacheClear_Create(ControlState *state);
 CommandOps *controlCacheClear_HelpCreate(ControlState *state);
 #endif  // Control_CacheClear_h
diff --git a/hicn-light/src/config/controlCacheServe.c b/hicn-light/src/hicn/config/controlCacheServe.c
index 9181810dd..e0c1c20eb 100644
--- a/hicn-light/src/config/controlCacheServe.c
+++ b/hicn-light/src/hicn/config/controlCacheServe.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -24,10 +24,10 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlCacheServe.h>
+#include <hicn/config/controlCacheServe.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlCacheServe_Execute(CommandParser *parser,
                                                 CommandOps *ops,
diff --git a/hicn-light/src/config/controlCacheServe.h b/hicn-light/src/hicn/config/controlCacheServe.h
index 4bcec51f0..afebc0601 100644
--- a/hicn-light/src/config/controlCacheServe.h
+++ b/hicn-light/src/hicn/config/controlCacheServe.h
@@ -16,7 +16,7 @@
 #ifndef Control_CacheServe_h
 #define Control_CacheServe_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlCacheServe_Create(ControlState *state);
 CommandOps *controlCacheServe_HelpCreate(ControlState *state);
 #endif  // Control_CacheServe_h
diff --git a/hicn-light/src/config/controlCacheStore.c b/hicn-light/src/hicn/config/controlCacheStore.c
index d586188fb..6f21f912b 100644
--- a/hicn-light/src/config/controlCacheStore.c
+++ b/hicn-light/src/hicn/config/controlCacheStore.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -24,10 +24,10 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlCacheStore.h>
+#include <hicn/config/controlCacheStore.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlCacheStore_Execute(CommandParser *parser,
                                                 CommandOps *ops,
diff --git a/hicn-light/src/config/controlCacheStore.h b/hicn-light/src/hicn/config/controlCacheStore.h
index ef5aca504..e32bf5663 100644
--- a/hicn-light/src/config/controlCacheStore.h
+++ b/hicn-light/src/hicn/config/controlCacheStore.h
@@ -16,7 +16,7 @@
 #ifndef Control_CacheStore_h
 #define Control_CacheStore_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlCacheStore_Create(ControlState *state);
 CommandOps *controlCacheStore_HelpCreate(ControlState *state);
 #endif  // Control_CacheStore_h
diff --git a/hicn-light/src/config/controlList.c b/hicn-light/src/hicn/config/controlList.c
index 7e4636b00..8c1b2e125 100644
--- a/hicn-light/src/config/controlList.c
+++ b/hicn-light/src/hicn/config/controlList.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -26,11 +26,11 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlList.h>
-#include <src/config/controlListConnections.h>
-//#include <src/config/controlListInterfaces.h>
-#include <src/config/controlListListeners.h>
-#include <src/config/controlListRoutes.h>
+#include <hicn/config/controlList.h>
+#include <hicn/config/controlListConnections.h>
+//#include <hicn/config/controlListInterfaces.h>
+#include <hicn/config/controlListListeners.h>
+#include <hicn/config/controlListRoutes.h>
 
 static void _controlList_Init(CommandParser *parser, CommandOps *ops);
 static CommandReturn _controlList_Execute(CommandParser *parser,
diff --git a/hicn-light/src/config/controlList.h b/hicn-light/src/hicn/config/controlList.h
index 53197331f..d497e5179 100644
--- a/hicn-light/src/config/controlList.h
+++ b/hicn-light/src/hicn/config/controlList.h
@@ -24,7 +24,7 @@
 #ifndef controlList_h
 #define controlList_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlList_Create(ControlState *state);
 CommandOps *controlList_HelpCreate(ControlState *state);
 #endif  // controlList_h
diff --git a/hicn-light/src/config/controlListConnections.c b/hicn-light/src/hicn/config/controlListConnections.c
index b7dda0bbe..feed36d2a 100644
--- a/hicn-light/src/config/controlListConnections.c
+++ b/hicn-light/src/hicn/config/controlListConnections.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -24,10 +24,10 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlListConnections.h>
+#include <hicn/config/controlListConnections.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlListConnections_Execute(CommandParser *parser,
                                                      CommandOps *ops,
diff --git a/hicn-light/src/config/controlListConnections.h b/hicn-light/src/hicn/config/controlListConnections.h
index 17422c963..cd5c21cec 100644
--- a/hicn-light/src/config/controlListConnections.h
+++ b/hicn-light/src/hicn/config/controlListConnections.h
@@ -24,7 +24,7 @@
 #ifndef Control_ListConnections_h
 #define Control_ListConnections_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlListConnections_Create(ControlState *state);
 CommandOps *controlListConnections_HelpCreate(ControlState *state);
 #endif  // Control_ListConnections_h
diff --git a/hicn-light/src/config/controlListInterfaces.c b/hicn-light/src/hicn/config/controlListInterfaces.c
index 914cc3552..0b8c3d7bb 100644
--- a/hicn-light/src/config/controlListInterfaces.c
+++ b/hicn-light/src/hicn/config/controlListInterfaces.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -24,7 +24,7 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlListInterfaces.h>
+#include <hicn/config/controlListInterfaces.h>
 
 static CommandReturn _controlListInterfaces_Execute(CommandParser *parser,
                                                     CommandOps *ops,
diff --git a/hicn-light/src/config/controlListInterfaces.h b/hicn-light/src/hicn/config/controlListInterfaces.h
index 0c0ca95cf..f885835ed 100644
--- a/hicn-light/src/config/controlListInterfaces.h
+++ b/hicn-light/src/hicn/config/controlListInterfaces.h
@@ -25,7 +25,7 @@
 #ifndef Control_ListInterfaces_h
 #define Control_ListInterfaces_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlListInterfaces_Create(ControlState *state);
 CommandOps *controlListInterfaces_HelpCreate(ControlState *state);
 #endif  // Control_ListInterfaces_h
diff --git a/hicn-light/src/config/controlListListeners.c b/hicn-light/src/hicn/config/controlListListeners.c
index e84912205..735be6acb 100644
--- a/hicn-light/src/config/controlListListeners.c
+++ b/hicn-light/src/hicn/config/controlListListeners.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -23,9 +23,9 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
 
-#include <src/config/controlListListeners.h>
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/config/controlListListeners.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlListListeners_Execute(CommandParser *parser,
                                                    CommandOps *ops,
diff --git a/hicn-light/src/config/controlListListeners.h b/hicn-light/src/hicn/config/controlListListeners.h
index 1f34eea56..11ec07579 100644
--- a/hicn-light/src/config/controlListListeners.h
+++ b/hicn-light/src/hicn/config/controlListListeners.h
@@ -25,7 +25,7 @@
 #ifndef Control_ListListeners_h
 #define Control_ListListeners_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlListListeners_Create(ControlState *state);
 CommandOps *controlListListeners_HelpCreate(ControlState *state);
 #endif  // Control_ListListeners_h
diff --git a/hicn-light/src/config/controlListRoutes.c b/hicn-light/src/hicn/config/controlListRoutes.c
index ba116ce76..97e7c2f5c 100644
--- a/hicn-light/src/config/controlListRoutes.c
+++ b/hicn-light/src/hicn/config/controlListRoutes.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -25,10 +25,10 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Time.h>
 
-#include <src/config/controlListRoutes.h>
+#include <hicn/config/controlListRoutes.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlListRoutes_Execute(CommandParser *parser,
                                                 CommandOps *ops,
diff --git a/hicn-light/src/config/controlListRoutes.h b/hicn-light/src/hicn/config/controlListRoutes.h
index 018c88ab0..341552add 100644
--- a/hicn-light/src/config/controlListRoutes.h
+++ b/hicn-light/src/hicn/config/controlListRoutes.h
@@ -23,7 +23,7 @@
 #ifndef Control_ListRoutes_h
 #define Control_ListRoutes_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlListRoutes_Create(ControlState *state);
 CommandOps *controlListRoutes_HelpCreate(ControlState *state);
 #endif  // Control_ListRoutes_h
diff --git a/hicn-light/src/config/controlMapMe.c b/hicn-light/src/hicn/config/controlMapMe.c
index a839a9173..896f53b8a 100644
--- a/hicn-light/src/config/controlMapMe.c
+++ b/hicn-light/src/hicn/config/controlMapMe.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -23,11 +23,11 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
 
-#include <src/config/controlMapMe.h>
-#include <src/config/controlMapMeDiscovery.h>
-#include <src/config/controlMapMeEnable.h>
-#include <src/config/controlMapMeRetx.h>
-#include <src/config/controlMapMeTimescale.h>
+#include <hicn/config/controlMapMe.h>
+#include <hicn/config/controlMapMeDiscovery.h>
+#include <hicn/config/controlMapMeEnable.h>
+#include <hicn/config/controlMapMeRetx.h>
+#include <hicn/config/controlMapMeTimescale.h>
 
 static void _controlMapMe_Init(CommandParser *parser, CommandOps *ops);
 static CommandReturn _controlMapMe_Execute(CommandParser *parser,
diff --git a/hicn-light/src/config/controlMapMe.h b/hicn-light/src/hicn/config/controlMapMe.h
index d9cfdb82c..3edd78989 100644
--- a/hicn-light/src/config/controlMapMe.h
+++ b/hicn-light/src/hicn/config/controlMapMe.h
@@ -16,7 +16,7 @@
 #ifndef controlMapMe_h
 #define controlMapMe_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlMapMe_Create(ControlState *state);
 CommandOps *controlMapMe_HelpCreate(ControlState *state);
 #endif  // controlMapMe_h
diff --git a/hicn-light/src/config/controlMapMeDiscovery.c b/hicn-light/src/hicn/config/controlMapMeDiscovery.c
index fd10cf18e..a4815c08b 100644
--- a/hicn-light/src/config/controlMapMeDiscovery.c
+++ b/hicn-light/src/hicn/config/controlMapMeDiscovery.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -22,10 +22,10 @@
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config/controlMapMeDiscovery.h>
+#include <hicn/config/controlMapMeDiscovery.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlMapMeDiscovery_Execute(CommandParser *parser,
                                                     CommandOps *ops,
diff --git a/hicn-light/src/config/controlMapMeDiscovery.h b/hicn-light/src/hicn/config/controlMapMeDiscovery.h
index c492fa0ab..c2832632a 100644
--- a/hicn-light/src/config/controlMapMeDiscovery.h
+++ b/hicn-light/src/hicn/config/controlMapMeDiscovery.h
@@ -16,7 +16,7 @@
 #ifndef Control_MapMeDiscovery_h
 #define Control_MapMeDiscovery_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlMapMeDiscovery_Create(ControlState *state);
 CommandOps *controlMapMeDiscovery_HelpCreate(ControlState *state);
 #endif  // Control_MapMeDiscovery_h
diff --git a/hicn-light/src/config/controlMapMeEnable.c b/hicn-light/src/hicn/config/controlMapMeEnable.c
index 587aa6eb6..04b103a54 100644
--- a/hicn-light/src/config/controlMapMeEnable.c
+++ b/hicn-light/src/hicn/config/controlMapMeEnable.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -22,10 +22,10 @@
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config/controlMapMeEnable.h>
+#include <hicn/config/controlMapMeEnable.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlMapMeEnable_Execute(CommandParser *parser,
                                                  CommandOps *ops,
diff --git a/hicn-light/src/config/controlMapMeEnable.h b/hicn-light/src/hicn/config/controlMapMeEnable.h
index f7ca6204d..0ce4970f3 100644
--- a/hicn-light/src/config/controlMapMeEnable.h
+++ b/hicn-light/src/hicn/config/controlMapMeEnable.h
@@ -16,7 +16,7 @@
 #ifndef Control_MapMeEnable_h
 #define Control_MapMeEnable_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlMapMeEnable_Create(ControlState *state);
 CommandOps *controlMapMeEnable_HelpCreate(ControlState *state);
 #endif  // Control_MapMeEnable_h
diff --git a/hicn-light/src/config/controlMapMeRetx.c b/hicn-light/src/hicn/config/controlMapMeRetx.c
index 21541d837..5546ded9a 100644
--- a/hicn-light/src/config/controlMapMeRetx.c
+++ b/hicn-light/src/hicn/config/controlMapMeRetx.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -22,10 +22,10 @@
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config/controlMapMeRetx.h>
+#include <hicn/config/controlMapMeRetx.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlMapMeRetx_Execute(CommandParser *parser,
                                                CommandOps *ops, PARCList *args);
diff --git a/hicn-light/src/config/controlMapMeRetx.h b/hicn-light/src/hicn/config/controlMapMeRetx.h
index 611bd3663..3e3b2de15 100644
--- a/hicn-light/src/config/controlMapMeRetx.h
+++ b/hicn-light/src/hicn/config/controlMapMeRetx.h
@@ -16,7 +16,7 @@
 #ifndef Control_MapMeRetx_h
 #define Control_MapMeRetx_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlMapMeRetx_Create(ControlState *state);
 CommandOps *controlMapMeRetx_HelpCreate(ControlState *state);
 #endif  // Control_MapMeRetx_h
diff --git a/hicn-light/src/config/controlMapMeTimescale.c b/hicn-light/src/hicn/config/controlMapMeTimescale.c
index 872a50abc..d621cdfed 100644
--- a/hicn-light/src/config/controlMapMeTimescale.c
+++ b/hicn-light/src/hicn/config/controlMapMeTimescale.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -22,10 +22,10 @@
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config/controlMapMeTimescale.h>
+#include <hicn/config/controlMapMeTimescale.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlMapMeTimescale_Execute(CommandParser *parser,
                                                     CommandOps *ops,
diff --git a/hicn-light/src/config/controlMapMeTimescale.h b/hicn-light/src/hicn/config/controlMapMeTimescale.h
index d4b383696..947d00a5d 100644
--- a/hicn-light/src/config/controlMapMeTimescale.h
+++ b/hicn-light/src/hicn/config/controlMapMeTimescale.h
@@ -16,7 +16,7 @@
 #ifndef Control_MapMeTimescale_h
 #define Control_MapMeTimescale_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlMapMeTimescale_Create(ControlState *state);
 CommandOps *controlMapMeTimescale_HelpCreate(ControlState *state);
 #endif  // Control_MapMeTimescale_h
diff --git a/hicn-light/src/config/controlQuit.c b/hicn-light/src/hicn/config/controlQuit.c
index 6df163c49..ddea256b2 100644
--- a/hicn-light/src/config/controlQuit.c
+++ b/hicn-light/src/hicn/config/controlQuit.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -25,7 +25,7 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/security/parc_Security.h>
 
-#include <src/config/controlQuit.h>
+#include <hicn/config/controlQuit.h>
 
 static CommandReturn _controlQuit_Execute(CommandParser *parser,
                                           CommandOps *ops, PARCList *args);
diff --git a/hicn-light/src/config/controlQuit.h b/hicn-light/src/hicn/config/controlQuit.h
index e2ba3540e..b45d5e215 100644
--- a/hicn-light/src/config/controlQuit.h
+++ b/hicn-light/src/hicn/config/controlQuit.h
@@ -23,7 +23,7 @@
 #ifndef Control_Quit_h
 #define Control_Quit_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlQuit_Create(ControlState *state);
 CommandOps *controlQuit_HelpCreate(ControlState *state);
 #endif  // Control_Quit_h
diff --git a/hicn-light/src/config/controlRemove.c b/hicn-light/src/hicn/config/controlRemove.c
index da4b69fd9..1768b7651 100644
--- a/hicn-light/src/config/controlRemove.c
+++ b/hicn-light/src/hicn/config/controlRemove.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -26,10 +26,10 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlRemove.h>
-#include <src/config/controlRemoveConnection.h>
-#include <src/config/controlRemovePunting.h>
-#include <src/config/controlRemoveRoute.h>
+#include <hicn/config/controlRemove.h>
+#include <hicn/config/controlRemoveConnection.h>
+#include <hicn/config/controlRemovePunting.h>
+#include <hicn/config/controlRemoveRoute.h>
 
 static void _controlRemove_Init(CommandParser *parser, CommandOps *ops);
 static CommandReturn _controlRemove_Execute(CommandParser *parser,
diff --git a/hicn-light/src/config/controlRemove.h b/hicn-light/src/hicn/config/controlRemove.h
index d75ecfe70..863555728 100644
--- a/hicn-light/src/config/controlRemove.h
+++ b/hicn-light/src/hicn/config/controlRemove.h
@@ -23,7 +23,7 @@
 #ifndef controlRemove_h
 #define controlRemove_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlRemove_Create(ControlState *state);
 CommandOps *controlRemove_HelpCreate(ControlState *state);
 #endif  // controlRemove_h
diff --git a/hicn-light/src/config/controlRemoveConnection.c b/hicn-light/src/hicn/config/controlRemoveConnection.c
index c701fc77f..0f2d315c3 100644
--- a/hicn-light/src/config/controlRemoveConnection.c
+++ b/hicn-light/src/hicn/config/controlRemoveConnection.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <ctype.h>
 #include <stdbool.h>
@@ -25,12 +25,12 @@
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
-#include <src/config/controlRemoveConnection.h>
+#include <hicn/config/controlRemoveConnection.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlRemoveConnection_Execute(CommandParser *parser,
                                                       CommandOps *ops,
diff --git a/hicn-light/src/config/controlRemoveConnection.h b/hicn-light/src/hicn/config/controlRemoveConnection.h
index 1dd1af23b..51d3a52a8 100644
--- a/hicn-light/src/config/controlRemoveConnection.h
+++ b/hicn-light/src/hicn/config/controlRemoveConnection.h
@@ -25,7 +25,7 @@
 #ifndef Control_RemoveConnection_h
 #define Control_RemoveConnection_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlRemoveConnection_Create(ControlState *state);
 CommandOps *controlRemoveConnection_HelpCreate(ControlState *state);
 #endif  // Control_RemoveConnection_h
diff --git a/hicn-light/src/config/controlRemovePunting.c b/hicn-light/src/hicn/config/controlRemovePunting.c
index 0ae80ec9b..b105449ee 100644
--- a/hicn-light/src/config/controlRemovePunting.c
+++ b/hicn-light/src/hicn/config/controlRemovePunting.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <ctype.h>
 #include <stdbool.h>
@@ -25,9 +25,9 @@
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
-#include <src/config/controlRemovePunting.h>
+#include <hicn/config/controlRemovePunting.h>
 
 static CommandReturn _controlRemovePunting_Execute(CommandParser *parser,
                                                    CommandOps *ops,
diff --git a/hicn-light/src/config/controlRemovePunting.h b/hicn-light/src/hicn/config/controlRemovePunting.h
index 89b1343e7..858d6f969 100644
--- a/hicn-light/src/config/controlRemovePunting.h
+++ b/hicn-light/src/hicn/config/controlRemovePunting.h
@@ -21,7 +21,7 @@
 #ifndef Control_RemovePunting_h
 #define Control_RemovePunting_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlRemovePunting_Create(ControlState *state);
 CommandOps *controlRemovePunting_HelpCreate(ControlState *state);
 #endif  // Control_RemovePunting_h
diff --git a/hicn-light/src/config/controlRemoveRoute.c b/hicn-light/src/hicn/config/controlRemoveRoute.c
index c4efb04df..6bfe12674 100644
--- a/hicn-light/src/config/controlRemoveRoute.c
+++ b/hicn-light/src/hicn/config/controlRemoveRoute.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <ctype.h>
 #include <parc/algol/parc_List.h>
@@ -25,12 +25,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
-#include <src/config/controlRemoveRoute.h>
+#include <hicn/config/controlRemoveRoute.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlRemoveRoute_Execute(CommandParser *parser,
                                                  CommandOps *ops,
diff --git a/hicn-light/src/config/controlRemoveRoute.h b/hicn-light/src/hicn/config/controlRemoveRoute.h
index a3c0ee46a..5e152b2fd 100644
--- a/hicn-light/src/config/controlRemoveRoute.h
+++ b/hicn-light/src/hicn/config/controlRemoveRoute.h
@@ -25,7 +25,7 @@
 #ifndef Control_RemoveRoute_h
 #define Control_RemoveRoute_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlRemoveRoute_Create(ControlState *state);
 CommandOps *controlRemoveRoute_HelpCreate(ControlState *state);
 #endif  // Control_RemoveRoute_h
diff --git a/hicn-light/src/config/controlRoot.c b/hicn-light/src/hicn/config/controlRoot.c
index 49b613208..38a371e73 100644
--- a/hicn-light/src/config/controlRoot.c
+++ b/hicn-light/src/hicn/config/controlRoot.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -22,15 +22,15 @@
 
 #include <parc/assert/parc_Assert.h>
 
-#include <src/config/controlAdd.h>
-#include <src/config/controlCache.h>
-#include <src/config/controlList.h>
-#include <src/config/controlMapMe.h>
-#include <src/config/controlQuit.h>
-#include <src/config/controlRemove.h>
-#include <src/config/controlRoot.h>
-#include <src/config/controlSet.h>
-#include <src/config/controlUnset.h>
+#include <hicn/config/controlAdd.h>
+#include <hicn/config/controlCache.h>
+#include <hicn/config/controlList.h>
+#include <hicn/config/controlMapMe.h>
+#include <hicn/config/controlQuit.h>
+#include <hicn/config/controlRemove.h>
+#include <hicn/config/controlRoot.h>
+#include <hicn/config/controlSet.h>
+#include <hicn/config/controlUnset.h>
 
 static void _controlRoot_Init(CommandParser *parser, CommandOps *ops);
 static CommandReturn _controlRoot_Execute(CommandParser *parser,
diff --git a/hicn-light/src/config/controlRoot.h b/hicn-light/src/hicn/config/controlRoot.h
index a62126eba..154b81a80 100644
--- a/hicn-light/src/config/controlRoot.h
+++ b/hicn-light/src/hicn/config/controlRoot.h
@@ -25,7 +25,7 @@
 #ifndef Control_Root_h
 #define Control_Root_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlRoot_Create(ControlState *state);
 CommandOps *controlRoot_HelpCreate(ControlState *state);
 #endif  // Control_Root_h
diff --git a/hicn-light/src/config/controlSet.c b/hicn-light/src/hicn/config/controlSet.c
index 07ca7e6b0..4c94893dc 100644
--- a/hicn-light/src/config/controlSet.c
+++ b/hicn-light/src/hicn/config/controlSet.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -25,10 +25,10 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/security/parc_Security.h>
 
-#include <src/config/controlSet.h>
-#include <src/config/controlSetDebug.h>
-#include <src/config/controlSetStrategy.h>
-#include <src/config/controlSetWldr.h>
+#include <hicn/config/controlSet.h>
+#include <hicn/config/controlSetDebug.h>
+#include <hicn/config/controlSetStrategy.h>
+#include <hicn/config/controlSetWldr.h>
 
 static void _controlSet_Init(CommandParser *parser, CommandOps *ops);
 static CommandReturn _controlSet_Execute(CommandParser *parser, CommandOps *ops,
diff --git a/hicn-light/src/config/controlSet.h b/hicn-light/src/hicn/config/controlSet.h
index 4289aad8c..abe2a611d 100644
--- a/hicn-light/src/config/controlSet.h
+++ b/hicn-light/src/hicn/config/controlSet.h
@@ -23,7 +23,7 @@
 #ifndef Control_Set_h
 #define Control_Set_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlSet_Create(ControlState *state);
 CommandOps *controlSet_HelpCreate(ControlState *state);
 #endif  // Control_Set_h
diff --git a/hicn-light/src/config/controlSetDebug.c b/hicn-light/src/hicn/config/controlSetDebug.c
index 1739e777a..a18c860af 100644
--- a/hicn-light/src/config/controlSetDebug.c
+++ b/hicn-light/src/hicn/config/controlSetDebug.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -24,9 +24,9 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlSetDebug.h>
-#include <src/core/dispatcher.h>
-#include <src/core/forwarder.h>
+#include <hicn/config/controlSetDebug.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/core/forwarder.h>
 
 static CommandReturn _controlSetDebug_Execute(CommandParser *parser,
                                               CommandOps *ops, PARCList *args);
diff --git a/hicn-light/src/config/controlSetDebug.h b/hicn-light/src/hicn/config/controlSetDebug.h
index 5335ebcab..fabeb6952 100644
--- a/hicn-light/src/config/controlSetDebug.h
+++ b/hicn-light/src/hicn/config/controlSetDebug.h
@@ -24,7 +24,7 @@
 #ifndef Control_SetDebug_h
 #define Control_SetDebug_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlSetDebug_Create(ControlState *state);
 CommandOps *controlSetDebug_HelpCreate(ControlState *state);
 #endif  // Control_SetDebug_h
diff --git a/hicn-light/src/config/controlSetStrategy.c b/hicn-light/src/hicn/config/controlSetStrategy.c
index 579862eeb..c7909bbb7 100644
--- a/hicn-light/src/config/controlSetStrategy.c
+++ b/hicn-light/src/hicn/config/controlSetStrategy.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -25,12 +25,12 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
 
-#include <src/config/controlSetDebug.h>
-#include <src/core/dispatcher.h>
-#include <src/core/forwarder.h>
+#include <hicn/config/controlSetDebug.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/core/forwarder.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlSetStrategy_Execute(CommandParser *parser,
                                                  CommandOps *ops,
diff --git a/hicn-light/src/config/controlSetStrategy.h b/hicn-light/src/hicn/config/controlSetStrategy.h
index 53ce8912c..7ad56ccba 100644
--- a/hicn-light/src/config/controlSetStrategy.h
+++ b/hicn-light/src/hicn/config/controlSetStrategy.h
@@ -16,7 +16,7 @@
 #ifndef Control_SetStrategy_h
 #define Control_SetStrategy_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlSetStrategy_Create(ControlState *state);
 CommandOps *controlSetStrategy_HelpCreate(ControlState *state);
 #endif  // Control_SetStrategy_h
diff --git a/hicn-light/src/config/controlSetWldr.c b/hicn-light/src/hicn/config/controlSetWldr.c
index 7bb055af8..22729705a 100644
--- a/hicn-light/src/config/controlSetWldr.c
+++ b/hicn-light/src/hicn/config/controlSetWldr.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -24,12 +24,12 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlSetDebug.h>
-#include <src/core/dispatcher.h>
-#include <src/core/forwarder.h>
+#include <hicn/config/controlSetDebug.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/core/forwarder.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
 static CommandReturn _controlSetWldr_Execute(CommandParser *parser,
                                              CommandOps *ops, PARCList *args);
diff --git a/hicn-light/src/config/controlSetWldr.h b/hicn-light/src/hicn/config/controlSetWldr.h
index 59c0b0fe6..3c01110e4 100644
--- a/hicn-light/src/config/controlSetWldr.h
+++ b/hicn-light/src/hicn/config/controlSetWldr.h
@@ -16,7 +16,7 @@
 #ifndef Control_SetWldr_h
 #define Control_SetWldr_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlSetWldr_Create(ControlState *state);
 CommandOps *controlSetWldr_HelpCreate(ControlState *state);
 #endif  // Control_SetWldr_h
diff --git a/hicn-light/src/config/controlState.c b/hicn-light/src/hicn/config/controlState.c
index c3b7d535b..ad26c1bab 100644
--- a/hicn-light/src/config/controlState.c
+++ b/hicn-light/src/hicn/config/controlState.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -31,11 +31,11 @@
 #include <parc/algol/parc_Time.h>
 #include <parc/algol/parc_TreeRedBlack.h>
 
-#include <src/config/commandParser.h>
-#include <src/config/controlRoot.h>
-#include <src/config/controlState.h>
+#include <hicn/config/commandParser.h>
+#include <hicn/config/controlRoot.h>
+#include <hicn/config/controlState.h>
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 #define SRV_IP "127.0.0.1"
 #define PORT 9695
diff --git a/hicn-light/src/config/controlState.h b/hicn-light/src/hicn/config/controlState.h
index 905c56c30..25542657f 100644
--- a/hicn-light/src/config/controlState.h
+++ b/hicn-light/src/hicn/config/controlState.h
@@ -28,9 +28,9 @@
 #define control_h
 
 #include <parc/algol/parc_List.h>
-#include <src/config/commandParser.h>
+#include <hicn/config/commandParser.h>
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 struct controller_state;
 typedef struct controller_state ControlState;
diff --git a/hicn-light/src/config/controlUnset.c b/hicn-light/src/hicn/config/controlUnset.c
index 2742940fa..b0950c141 100644
--- a/hicn-light/src/config/controlUnset.c
+++ b/hicn-light/src/hicn/config/controlUnset.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -25,8 +25,8 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/security/parc_Security.h>
 
-#include <src/config/controlUnset.h>
-#include <src/config/controlUnsetDebug.h>
+#include <hicn/config/controlUnset.h>
+#include <hicn/config/controlUnsetDebug.h>
 
 static void _controlUnset_Init(CommandParser *parser, CommandOps *ops);
 
diff --git a/hicn-light/src/config/controlUnset.h b/hicn-light/src/hicn/config/controlUnset.h
index 6eeb983f7..9d9cb5c44 100644
--- a/hicn-light/src/config/controlUnset.h
+++ b/hicn-light/src/hicn/config/controlUnset.h
@@ -23,7 +23,7 @@
 #ifndef Control_Unset_h
 #define Control_Unset_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlUnset_Create(ControlState *state);
 CommandOps *controlUnset_HelpCreate(ControlState *state);
 #endif  // Control_Unset_h
diff --git a/hicn-light/src/config/controlUnsetDebug.c b/hicn-light/src/hicn/config/controlUnsetDebug.c
index bf3f6fe68..87ad24fce 100644
--- a/hicn-light/src/config/controlUnsetDebug.c
+++ b/hicn-light/src/hicn/config/controlUnsetDebug.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -24,9 +24,9 @@
 
 #include <parc/algol/parc_Memory.h>
 
-#include <src/config/controlUnsetDebug.h>
-#include <src/core/dispatcher.h>
-#include <src/core/forwarder.h>
+#include <hicn/config/controlUnsetDebug.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/core/forwarder.h>
 
 static CommandReturn _controlUnsetDebug_Execute(CommandParser *parser,
                                                 CommandOps *ops,
diff --git a/hicn-light/src/config/controlUnsetDebug.h b/hicn-light/src/hicn/config/controlUnsetDebug.h
index e34f8aa5f..c76ba8c98 100644
--- a/hicn-light/src/config/controlUnsetDebug.h
+++ b/hicn-light/src/hicn/config/controlUnsetDebug.h
@@ -24,7 +24,7 @@
 #ifndef Control_UnsetDebug_h
 #define Control_UnsetDebug_h
 
-#include <src/config/controlState.h>
+#include <hicn/config/controlState.h>
 CommandOps *controlUnsetDebug_Create(ControlState *state);
 CommandOps *controlUnsetDebug_HelpCreate(ControlState *state);
 #endif  // Control_UnsetDebug_h
diff --git a/hicn-light/src/config/symbolicNameTable.c b/hicn-light/src/hicn/config/symbolicNameTable.c
index ccf416d67..7ddb20668 100644
--- a/hicn-light/src/config/symbolicNameTable.c
+++ b/hicn-light/src/hicn/config/symbolicNameTable.c
@@ -18,10 +18,10 @@
 #include <parc/algol/parc_HashCodeTable.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/config/symbolicNameTable.h>
+#include <hicn/config/symbolicNameTable.h>
 
 struct symblic_name_table {
   PARCHashCodeTable *symbolicNameTable;
diff --git a/hicn-light/src/config/symbolicNameTable.h b/hicn-light/src/hicn/config/symbolicNameTable.h
index 69919cf00..69919cf00 100644
--- a/hicn-light/src/config/symbolicNameTable.h
+++ b/hicn-light/src/hicn/config/symbolicNameTable.h
diff --git a/hicn-light/src/content_store/CMakeLists.txt b/hicn-light/src/hicn/content_store/CMakeLists.txt
index 85643cf5e..85643cf5e 100644
--- a/hicn-light/src/content_store/CMakeLists.txt
+++ b/hicn-light/src/hicn/content_store/CMakeLists.txt
diff --git a/hicn-light/src/content_store/contentStoreEntry.c b/hicn-light/src/hicn/content_store/contentStoreEntry.c
index d36ed61a0..1e03f42b6 100644
--- a/hicn-light/src/content_store/contentStoreEntry.c
+++ b/hicn-light/src/hicn/content_store/contentStoreEntry.c
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_Memory.h>
-#include <src/content_store/contentStoreEntry.h>
+#include <hicn/content_store/contentStoreEntry.h>
 
 #include <parc/assert/parc_Assert.h>
 
diff --git a/hicn-light/src/content_store/contentStoreEntry.h b/hicn-light/src/hicn/content_store/contentStoreEntry.h
index 766cc15e4..4f0fd19c1 100644
--- a/hicn-light/src/content_store/contentStoreEntry.h
+++ b/hicn-light/src/hicn/content_store/contentStoreEntry.h
@@ -16,8 +16,8 @@
 #ifndef contentStoreEntry_h
 #define contentStoreEntry_h
 
-#include <src/content_store/listLRU.h>
-#include <src/core/message.h>
+#include <hicn/content_store/listLRU.h>
+#include <hicn/core/message.h>
 
 struct contentstore_entry;
 typedef struct contentstore_entry ContentStoreEntry;
diff --git a/hicn-light/src/content_store/contentStoreInterface.c b/hicn-light/src/hicn/content_store/contentStoreInterface.c
index a42041670..b82fa906e 100644
--- a/hicn-light/src/content_store/contentStoreInterface.c
+++ b/hicn-light/src/hicn/content_store/contentStoreInterface.c
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/content_store/contentStoreInterface.h>
+#include <hicn/content_store/contentStoreInterface.h>
 
 void contentStoreInterface_Release(ContentStoreInterface **storeImplPtr) {
   (*storeImplPtr)->release(storeImplPtr);
diff --git a/hicn-light/src/content_store/contentStoreInterface.h b/hicn-light/src/hicn/content_store/contentStoreInterface.h
index d73c63019..b2bc3f919 100644
--- a/hicn-light/src/content_store/contentStoreInterface.h
+++ b/hicn-light/src/hicn/content_store/contentStoreInterface.h
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include <src/core/message.h>
+#include <hicn/core/message.h>
 
 typedef struct contentstore_config {
   size_t objectCapacity;
diff --git a/hicn-light/src/content_store/contentStoreLRU.c b/hicn-light/src/hicn/content_store/contentStoreLRU.c
index 2eb043d8e..6add33d78 100644
--- a/hicn-light/src/content_store/contentStoreLRU.c
+++ b/hicn-light/src/hicn/content_store/contentStoreLRU.c
@@ -16,24 +16,24 @@
 #ifndef _WIN32
 #include <sys/queue.h>
 #endif
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_DisplayIndented.h>
 #include <parc/algol/parc_HashCodeTable.h>
 #include <parc/algol/parc_Object.h>
 
-#include <src/core/logger.h>
+#include <hicn/core/logger.h>
 
-#include <src/content_store/contentStoreLRU.h>
+#include <hicn/content_store/contentStoreLRU.h>
 
-#include <src/content_store/contentStoreEntry.h>
-#include <src/content_store/contentStoreInterface.h>
-#include <src/content_store/listLRU.h>
-#include <src/content_store/listTimeOrdered.h>
+#include <hicn/content_store/contentStoreEntry.h>
+#include <hicn/content_store/contentStoreInterface.h>
+#include <hicn/content_store/listLRU.h>
+#include <hicn/content_store/listTimeOrdered.h>
 
 #include <parc/assert/parc_Assert.h>
-#include <src/processor/hashTableFunction.h>
+#include <hicn/processor/hashTableFunction.h>
 
 typedef struct contentstore_stats {
   uint64_t countExpiryEvictions;
diff --git a/hicn-light/src/content_store/contentStoreLRU.h b/hicn-light/src/hicn/content_store/contentStoreLRU.h
index 3c0815ebd..94ec4d6b2 100644
--- a/hicn-light/src/content_store/contentStoreLRU.h
+++ b/hicn-light/src/hicn/content_store/contentStoreLRU.h
@@ -16,8 +16,8 @@
 #ifndef contentStoreLRU_h
 #define contentStoreLRU_h
 
-#include <src/content_store/contentStoreInterface.h>
-#include <src/core/logger.h>
+#include <hicn/content_store/contentStoreInterface.h>
+#include <hicn/core/logger.h>
 #include <stdio.h>
 
 /**
diff --git a/hicn-light/src/content_store/listLRU.c b/hicn-light/src/hicn/content_store/listLRU.c
index 0a1631bab..0a75c01a1 100644
--- a/hicn-light/src/content_store/listLRU.c
+++ b/hicn-light/src/hicn/content_store/listLRU.c
@@ -16,13 +16,13 @@
 #ifndef _WIN32
 #include <sys/queue.h>
 #endif
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/content_store/listLRU.h>
+#include <hicn/content_store/listLRU.h>
 
 struct list_lru_entry {
   void *userData;
diff --git a/hicn-light/src/content_store/listLRU.h b/hicn-light/src/hicn/content_store/listLRU.h
index 75f698b61..75f698b61 100644
--- a/hicn-light/src/content_store/listLRU.h
+++ b/hicn-light/src/hicn/content_store/listLRU.h
diff --git a/hicn-light/src/content_store/listTimeOrdered.c b/hicn-light/src/hicn/content_store/listTimeOrdered.c
index 44697d202..33808349b 100644
--- a/hicn-light/src/content_store/listTimeOrdered.c
+++ b/hicn-light/src/hicn/content_store/listTimeOrdered.c
@@ -14,8 +14,8 @@
  */
 
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
-#include <src/content_store/listTimeOrdered.h>
+#include <src/hicn/config.h>
+#include <hicn/content_store/listTimeOrdered.h>
 
 #include <parc/algol/parc_Object.h>
 #include <parc/algol/parc_TreeRedBlack.h>
diff --git a/hicn-light/src/content_store/listTimeOrdered.h b/hicn-light/src/hicn/content_store/listTimeOrdered.h
index b18bd16f7..325e7c0d4 100644
--- a/hicn-light/src/content_store/listTimeOrdered.h
+++ b/hicn-light/src/hicn/content_store/listTimeOrdered.h
@@ -17,8 +17,8 @@
 #define listTimeOrdered_h
 
 #include <parc/algol/parc_TreeRedBlack.h>
-#include <src/content_store/contentStoreEntry.h>
-#include <src/core/message.h>
+#include <hicn/content_store/contentStoreEntry.h>
+#include <hicn/core/message.h>
 #include <stdio.h>
 
 struct list_timeordered;
diff --git a/hicn-light/src/core/CMakeLists.txt b/hicn-light/src/hicn/core/CMakeLists.txt
index 1d7dc03e9..1d7dc03e9 100644
--- a/hicn-light/src/core/CMakeLists.txt
+++ b/hicn-light/src/hicn/core/CMakeLists.txt
diff --git a/hicn-light/src/core/connection.c b/hicn-light/src/hicn/core/connection.c
index 525fe29c4..36fb20ec9 100644
--- a/hicn-light/src/core/connection.c
+++ b/hicn-light/src/hicn/core/connection.c
@@ -14,15 +14,15 @@
  */
 
 #include <limits.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/core/connection.h>
-#include <src/core/messageHandler.h>
-#include <src/core/ticks.h>
-#include <src/core/wldr.h>
-#include <src/io/addressPair.h>
-#include <src/io/ioOperations.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/messageHandler.h>
+#include <hicn/core/ticks.h>
+#include <hicn/core/wldr.h>
+#include <hicn/io/addressPair.h>
+#include <hicn/io/ioOperations.h>
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
diff --git a/hicn-light/src/core/connection.h b/hicn-light/src/hicn/core/connection.h
index 56fa131b5..efe8a66b9 100644
--- a/hicn-light/src/core/connection.h
+++ b/hicn-light/src/hicn/core/connection.h
@@ -24,9 +24,9 @@
 
 #ifndef connection_h
 #define connection_h
-#include <src/config.h>
-#include <src/io/ioOperations.h>
-#include <src/utils/address.h>
+#include <src/hicn/config.h>
+#include <hicn/io/ioOperations.h>
+#include <hicn/utils/address.h>
 
 // packet types for probing
 #define PACKET_TYPE_PROBE_REQUEST 5
diff --git a/hicn-light/src/core/connectionList.c b/hicn-light/src/hicn/core/connectionList.c
index b2913fa05..cc76f84de 100644
--- a/hicn-light/src/core/connectionList.c
+++ b/hicn-light/src/hicn/core/connectionList.c
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_ArrayList.h>
 #include <parc/algol/parc_Memory.h>
 
 #include <parc/assert/parc_Assert.h>
-#include <src/core/connectionList.h>
+#include <hicn/core/connectionList.h>
 
 struct connection_list {
   PARCArrayList *listOfConnections;
diff --git a/hicn-light/src/core/connectionList.h b/hicn-light/src/hicn/core/connectionList.h
index cdca12993..fbba9f6d8 100644
--- a/hicn-light/src/core/connectionList.h
+++ b/hicn-light/src/hicn/core/connectionList.h
@@ -27,7 +27,7 @@
 struct connection_list;
 typedef struct connection_list ConnectionList;
 
-#include <src/core/connection.h>
+#include <hicn/core/connection.h>
 
 /**
  * Creates a lis of Connection
diff --git a/hicn-light/src/core/connectionManager.c b/hicn-light/src/hicn/core/connectionManager.c
index 2089e1495..0b2c51f9c 100644
--- a/hicn-light/src/core/connectionManager.c
+++ b/hicn-light/src/hicn/core/connectionManager.c
@@ -22,12 +22,12 @@
  *
  */
 
-#include <src/config.h>
-#include <src/core/connectionManager.h>
-#include <src/core/forwarder.h>
-#include <src/messenger/messenger.h>
-#include <src/messenger/messengerRecipient.h>
-#include <src/messenger/missiveDeque.h>
+#include <src/hicn/config.h>
+#include <hicn/core/connectionManager.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/messenger/messenger.h>
+#include <hicn/messenger/messengerRecipient.h>
+#include <hicn/messenger/missiveDeque.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_Memory.h>
diff --git a/hicn-light/src/core/connectionManager.h b/hicn-light/src/hicn/core/connectionManager.h
index b77553e0d..34fee8717 100644
--- a/hicn-light/src/core/connectionManager.h
+++ b/hicn-light/src/hicn/core/connectionManager.h
@@ -26,7 +26,7 @@
 #ifndef connectionManager_h
 #define connectionManager_h
 
-#include <src/core/forwarder.h>
+#include <hicn/core/forwarder.h>
 
 struct connection_manager;
 typedef struct connection_manager ConnectionManager;
diff --git a/hicn-light/src/core/connectionTable.c b/hicn-light/src/hicn/core/connectionTable.c
index 8634ec825..b0f717bc6 100644
--- a/hicn-light/src/core/connectionTable.c
+++ b/hicn-light/src/hicn/core/connectionTable.c
@@ -23,7 +23,7 @@
 #ifndef _WIN32
 #include <unistd.h>
 #endif
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,8 +35,8 @@
 #include <parc/algol/parc_HashCodeTable.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_TreeRedBlack.h>
-#include <src/core/connectionTable.h>
-#include <src/io/addressPair.h>
+#include <hicn/core/connectionTable.h>
+#include <hicn/io/addressPair.h>
 
 struct connection_table {
   // The main storage table that has a Destroy method.
diff --git a/hicn-light/src/core/connectionTable.h b/hicn-light/src/hicn/core/connectionTable.h
index 30517ae1d..bd8f553c2 100644
--- a/hicn-light/src/core/connectionTable.h
+++ b/hicn-light/src/hicn/core/connectionTable.h
@@ -19,10 +19,10 @@
 #ifndef connectionTable_h
 #define connectionTable_h
 
-#include <src/core/connection.h>
-#include <src/core/connectionList.h>
-#include <src/io/addressPair.h>
-#include <src/io/ioOperations.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/connectionList.h>
+#include <hicn/io/addressPair.h>
+#include <hicn/io/ioOperations.h>
 
 struct connection_table;
 typedef struct connection_table ConnectionTable;
diff --git a/hicn-light/src/core/dispatcher.c b/hicn-light/src/hicn/core/dispatcher.c
index b6ef5e21f..8d39e651a 100644
--- a/hicn-light/src/core/dispatcher.c
+++ b/hicn-light/src/hicn/core/dispatcher.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -42,7 +42,7 @@
 
 #include <parc/assert/parc_Assert.h>
 
-#include <src/core/dispatcher.h>
+#include <hicn/core/dispatcher.h>
 
 #include <pthread.h>
 
diff --git a/hicn-light/src/core/dispatcher.h b/hicn-light/src/hicn/core/dispatcher.h
index 96bceb451..e5c2df336 100644
--- a/hicn-light/src/core/dispatcher.h
+++ b/hicn-light/src/hicn/core/dispatcher.h
@@ -44,7 +44,7 @@ typedef struct dispatcher Dispatcher;
 #include <parc/algol/parc_EventTimer.h>
 #include <parc/algol/parc_Memory.h>
 
-#include <src/core/logger.h>
+#include <hicn/core/logger.h>
 
 PARCEventScheduler *dispatcher_GetEventScheduler(Dispatcher *dispatcher);
 /**
@@ -253,8 +253,8 @@ void dispatcher_StopSignalEvent(Dispatcher *dispatcher, PARCEventSignal *event);
 // =============
 // stream buffers
 
-#include <src/core/streamBuffer.h>
-#include <src/io/addressPair.h>
+#include <hicn/core/streamBuffer.h>
+#include <hicn/io/addressPair.h>
 
 /**
  * @function dispatcher_CreateStreamBuffer
diff --git a/hicn-light/src/core/forwarder.c b/hicn-light/src/hicn/core/forwarder.c
index a7d151314..9b05304e8 100644
--- a/hicn-light/src/core/forwarder.c
+++ b/hicn-light/src/hicn/core/forwarder.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,20 +46,20 @@
 #include <parc/algol/parc_Object.h>
 #include <parc/logging/parc_LogReporterTextStdout.h>
 
-#include <src/core/connectionManager.h>
-#include <src/core/connectionTable.h>
-#include <src/core/dispatcher.h>
-#include <src/core/forwarder.h>
-#include <src/core/messagePacketType.h>
+#include <hicn/core/connectionManager.h>
+#include <hicn/core/connectionTable.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/messagePacketType.h>
 #ifdef WITH_MAPME
-#include <src/core/mapMe.h>
+#include <hicn/core/mapMe.h>
 #endif /* WITH_MAPME */
-#include <src/config/configuration.h>
-#include <src/config/configurationFile.h>
-#include <src/config/configurationListeners.h>
-#include <src/processor/messageProcessor.h>
+#include <hicn/config/configuration.h>
+#include <hicn/config/configurationFile.h>
+#include <hicn/config/configurationListeners.h>
+#include <hicn/processor/messageProcessor.h>
 
-#include <src/core/wldr.h>
+#include <hicn/core/wldr.h>
 
 #include <parc/assert/parc_Assert.h>
 
diff --git a/hicn-light/src/core/forwarder.h b/hicn-light/src/hicn/core/forwarder.h
index de736a1f8..c1b279d2e 100644
--- a/hicn-light/src/core/forwarder.h
+++ b/hicn-light/src/hicn/core/forwarder.h
@@ -26,32 +26,32 @@
 #endif
 #include <stdlib.h>
 
-#include <src/core/connectionTable.h>
-#include <src/core/dispatcher.h>
-#include <src/messenger/messenger.h>
+#include <hicn/core/connectionTable.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/messenger/messenger.h>
 
-#include <src/core/message.h>
+#include <hicn/core/message.h>
 
-#include <src/config/configuration.h>
+#include <hicn/config/configuration.h>
 
 #ifdef WITH_MAPME
-#include <src/processor/fib.h>
+#include <hicn/processor/fib.h>
 #endif /* WITH_MAPME */
 
-#include <src/core/logger.h>
-#include <src/core/ticks.h>
-#include <src/io/listenerSet.h>
+#include <hicn/core/logger.h>
+#include <hicn/core/ticks.h>
+#include <hicn/io/listenerSet.h>
 
-#include <src/processor/fibEntryList.h>
+#include <hicn/processor/fibEntryList.h>
 
 #include <parc/algol/parc_Clock.h>
 
-#include <src/socket/api.h>
+#include <hicn/socket/api.h>
 
 #define PORT_NUMBER 9695
 #define PORT_NUMBER_AS_STRING "9695"
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 // ==============================================
 
diff --git a/hicn-light/src/core/logger.c b/hicn-light/src/hicn/core/logger.c
index ebc8dc5a1..9399b9857 100644
--- a/hicn-light/src/core/logger.c
+++ b/hicn-light/src/hicn/core/logger.c
@@ -18,7 +18,7 @@
 #endif
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,8 +30,8 @@
 
 #include <parc/logging/parc_Log.h>
 
-#include <src/core/forwarder.h>
-#include <src/core/logger.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/logger.h>
 
 struct logger {
   PARCClock *clock;
diff --git a/hicn-light/src/core/logger.h b/hicn-light/src/hicn/core/logger.h
index c46a87097..c46a87097 100644
--- a/hicn-light/src/core/logger.h
+++ b/hicn-light/src/hicn/core/logger.h
diff --git a/hicn-light/src/core/mapMe.c b/hicn-light/src/hicn/core/mapMe.c
index d5ed08bfb..74ff1ed96 100644
--- a/hicn-light/src/core/mapMe.c
+++ b/hicn-light/src/hicn/core/mapMe.c
@@ -21,17 +21,17 @@
 #ifdef WITH_MAPME
 
 #include <hicn/hicn.h>
-#include <src/core/mapMe.h>
+#include <hicn/core/mapMe.h>
 #include <stdio.h>  // printf
 
-#include <src/core/connectionList.h>
-#include <src/core/forwarder.h>
-#include <src/core/logger.h>
-#include <src/core/message.h>
-#include <src/core/messagePacketType.h>  // packet types
-#include <src/core/ticks.h>
-#include <src/processor/fibEntry.h>
-#include <src/processor/pitEntry.h>
+#include <hicn/core/connectionList.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/logger.h>
+#include <hicn/core/message.h>
+#include <hicn/core/messagePacketType.h>  // packet types
+#include <hicn/core/ticks.h>
+#include <hicn/processor/fibEntry.h>
+#include <hicn/processor/pitEntry.h>
 
 #include <parc/algol/parc_HashMap.h>
 #include <parc/algol/parc_Iterator.h>
@@ -87,7 +87,7 @@ static MapMe MapMeDefault = {.retx = MAPME_DEFAULT_RETX,
 
 /******************************************************************************/
 
-#include <src/core/connection.h>
+#include <hicn/core/connection.h>
 
 bool mapMe_Init(MapMe **mapme, Forwarder *forwarder) {
   *mapme = malloc(sizeof(MapMe));
diff --git a/hicn-light/src/core/mapMe.h b/hicn-light/src/hicn/core/mapMe.h
index 39edd0bd7..a99d4710b 100644
--- a/hicn-light/src/core/mapMe.h
+++ b/hicn-light/src/hicn/core/mapMe.h
@@ -26,10 +26,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <src/io/hicnListener.h>
+#include <hicn/io/hicnListener.h>
 
 #include <hicn/hicn.h>
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 struct mapme;
 typedef struct mapme MapMe;
diff --git a/hicn-light/src/core/message.c b/hicn-light/src/hicn/core/message.c
index 9b807aebc..423241084 100644
--- a/hicn-light/src/core/message.c
+++ b/hicn-light/src/hicn/core/message.c
@@ -14,19 +14,19 @@
  */
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <src/core/forwarder.h>
-#include <src/core/message.h>
-#include <src/core/wldr.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/message.h>
+#include <hicn/core/wldr.h>
 
-#include <src/core/messageHandler.h>
+#include <hicn/core/messageHandler.h>
 
 #include <parc/algol/parc_Hash.h>
 #include <parc/algol/parc_Memory.h>
-#include <src/core/messagePacketType.h>
+#include <hicn/core/messagePacketType.h>
 
 #include <parc/assert/parc_Assert.h>
 
diff --git a/hicn-light/src/core/message.h b/hicn-light/src/hicn/core/message.h
index 88aa32480..9e5e125c6 100644
--- a/hicn-light/src/core/message.h
+++ b/hicn-light/src/hicn/core/message.h
@@ -21,19 +21,19 @@
 #ifndef message_h
 #define message_h
 
-#include <src/config.h>
-#include <src/core/logger.h>
-#include <src/core/messagePacketType.h>
-#include <src/core/streamBuffer.h>
+#include <src/hicn/config.h>
+#include <hicn/core/logger.h>
+#include <hicn/core/messagePacketType.h>
+#include <hicn/core/streamBuffer.h>
 
-#include <src/core/name.h>
+#include <hicn/core/name.h>
 
 #include <parc/algol/parc_EventBuffer.h>
 #include <parc/algol/parc_EventQueue.h>
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
-#include <src/core/ticks.h>
+#include <hicn/core/ticks.h>
 
 struct message;
 typedef struct message Message;
diff --git a/hicn-light/src/core/messageHandler.h b/hicn-light/src/hicn/core/messageHandler.h
index f469ac5b0..56f75c113 100644
--- a/hicn-light/src/core/messageHandler.h
+++ b/hicn-light/src/hicn/core/messageHandler.h
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include <hicn/hicn.h>
-#include <src/core/messagePacketType.h>
+#include <hicn/core/messagePacketType.h>
 
 #define H(packet) ((hicn_header_t *)packet)
 #define H6(packet) (H(packet)->v6.ip)
diff --git a/hicn-light/src/core/messagePacketType.h b/hicn-light/src/hicn/core/messagePacketType.h
index dfbb12342..dfbb12342 100644
--- a/hicn-light/src/core/messagePacketType.h
+++ b/hicn-light/src/hicn/core/messagePacketType.h
diff --git a/hicn-light/src/core/name.c b/hicn-light/src/hicn/core/name.c
index f6a452d27..91652b887 100644
--- a/hicn-light/src/core/name.c
+++ b/hicn-light/src/hicn/core/name.c
@@ -14,7 +14,7 @@
  */
 
 #include <limits.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -23,8 +23,8 @@
 #include <parc/algol/parc_Hash.h>
 #include <parc/algol/parc_Memory.h>
 
-#include <src/core/messageHandler.h>
-#include <src/core/name.h>
+#include <hicn/core/messageHandler.h>
+#include <hicn/core/name.h>
 
 #include <parc/algol/parc_Hash.h>
 
diff --git a/hicn-light/src/core/name.h b/hicn-light/src/hicn/core/name.h
index fb4ad7a56..8ab75cf05 100644
--- a/hicn-light/src/core/name.h
+++ b/hicn-light/src/hicn/core/name.h
@@ -19,11 +19,11 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include <src/core/messagePacketType.h>
-#include <src/core/nameBitvector.h>
-#include <src/utils/address.h>
+#include <hicn/core/messagePacketType.h>
+#include <hicn/core/nameBitvector.h>
+#include <hicn/utils/address.h>
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 struct name;
 typedef struct name Name;
diff --git a/hicn-light/src/core/nameBitvector.c b/hicn-light/src/hicn/core/nameBitvector.c
index 28ea513c4..8078778e3 100644
--- a/hicn-light/src/core/nameBitvector.c
+++ b/hicn-light/src/hicn/core/nameBitvector.c
@@ -20,12 +20,12 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
 
-#include <src/core/messageHandler.h>
-#include <src/core/nameBitvector.h>
+#include <hicn/core/messageHandler.h>
+#include <hicn/core/nameBitvector.h>
 
 #include <parc/algol/parc_Hash.h>
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 #define BLOCKS 2
 
diff --git a/hicn-light/src/core/nameBitvector.h b/hicn-light/src/hicn/core/nameBitvector.h
index fb94f8f1a..6ff859e3b 100644
--- a/hicn-light/src/core/nameBitvector.h
+++ b/hicn-light/src/hicn/core/nameBitvector.h
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 struct name_bitvector;
 typedef struct name_bitvector NameBitvector;
diff --git a/hicn-light/src/core/numberSet.c b/hicn-light/src/hicn/core/numberSet.c
index 75fec1524..9788a29c5 100644
--- a/hicn-light/src/core/numberSet.c
+++ b/hicn-light/src/hicn/core/numberSet.c
@@ -15,8 +15,8 @@
 
 #include <parc/algol/parc_ArrayList.h>
 #include <parc/algol/parc_Memory.h>
-#include <src/config.h>
-#include <src/core/numberSet.h>
+#include <src/hicn/config.h>
+#include <hicn/core/numberSet.h>
 #include <stdio.h>
 
 #include <parc/assert/parc_Assert.h>
diff --git a/hicn-light/src/core/numberSet.h b/hicn-light/src/hicn/core/numberSet.h
index 91a965d7b..91a965d7b 100644
--- a/hicn-light/src/core/numberSet.h
+++ b/hicn-light/src/hicn/core/numberSet.h
diff --git a/hicn-light/src/core/streamBuffer.c b/hicn-light/src/hicn/core/streamBuffer.c
index 7aebb5edb..6efc82004 100644
--- a/hicn-light/src/core/streamBuffer.c
+++ b/hicn-light/src/hicn/core/streamBuffer.c
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/assert/parc_Assert.h>
 
-#include <src/core/streamBuffer.h>
+#include <hicn/core/streamBuffer.h>
 
 void streamBuffer_Destroy(PARCEventQueue **bufferPtr) {
   parcAssertNotNull(bufferPtr, "Parameter must be non-null double pointer");
diff --git a/hicn-light/src/core/streamBuffer.h b/hicn-light/src/hicn/core/streamBuffer.h
index 27e793176..27e793176 100644
--- a/hicn-light/src/core/streamBuffer.h
+++ b/hicn-light/src/hicn/core/streamBuffer.h
diff --git a/hicn-light/src/core/system.h b/hicn-light/src/hicn/core/system.h
index 3c5c8cba2..be6c3e7cf 100644
--- a/hicn-light/src/core/system.h
+++ b/hicn-light/src/hicn/core/system.h
@@ -24,8 +24,8 @@
 #ifndef system_h
 #define system_h
 
-#include <src/core/forwarder.h>
-#include <src/utils/interfaceSet.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/utils/interfaceSet.h>
 
 /**
  * @function system_Interfaces
diff --git a/hicn-light/src/core/ticks.h b/hicn-light/src/hicn/core/ticks.h
index 8750abde5..8750abde5 100644
--- a/hicn-light/src/core/ticks.h
+++ b/hicn-light/src/hicn/core/ticks.h
diff --git a/hicn-light/src/core/wldr.c b/hicn-light/src/hicn/core/wldr.c
index a3e8756dd..ad3663d0d 100644
--- a/hicn-light/src/core/wldr.c
+++ b/hicn-light/src/hicn/core/wldr.c
@@ -15,9 +15,9 @@
 
 #include <parc/assert/parc_Assert.h>
 #include <parc/logging/parc_LogReporterTextStdout.h>
-#include <src/core/connection.h>
-#include <src/core/forwarder.h>
-#include <src/core/wldr.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/wldr.h>
 #include <stdint.h>
 #include <stdio.h>
 
diff --git a/hicn-light/src/core/wldr.h b/hicn-light/src/hicn/core/wldr.h
index 1666b4d3f..0e63fe7e7 100644
--- a/hicn-light/src/core/wldr.h
+++ b/hicn-light/src/hicn/core/wldr.h
@@ -16,9 +16,9 @@
 #ifndef wldr_h
 #define wldr_h
 
-#include <src/config.h>
-#include <src/core/connection.h>
-#include <src/core/message.h>
+#include <src/hicn/config.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/message.h>
 
 #define BUFFER_SIZE 8192
 #define MAX_RTX 3
diff --git a/hicn-light/src/io/CMakeLists.txt b/hicn-light/src/hicn/io/CMakeLists.txt
index f65f0b580..f65f0b580 100644
--- a/hicn-light/src/io/CMakeLists.txt
+++ b/hicn-light/src/hicn/io/CMakeLists.txt
diff --git a/hicn-light/src/io/addressPair.c b/hicn-light/src/hicn/io/addressPair.c
index 5d2017a3d..9dfd8f507 100644
--- a/hicn-light/src/io/addressPair.c
+++ b/hicn-light/src/hicn/io/addressPair.c
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_Hash.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Object.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/io/addressPair.h>
+#include <hicn/io/addressPair.h>
 
 struct address_pair {
   Address *local;
diff --git a/hicn-light/src/io/addressPair.h b/hicn-light/src/hicn/io/addressPair.h
index 5152267b6..f1b72e0dc 100644
--- a/hicn-light/src/io/addressPair.h
+++ b/hicn-light/src/hicn/io/addressPair.h
@@ -21,7 +21,7 @@
 #ifndef address_Pair_h
 #define address_Pair_h
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 struct address_pair;
 typedef struct address_pair AddressPair;
diff --git a/hicn-light/src/io/hicnConnection.c b/hicn-light/src/hicn/io/hicnConnection.c
index 991c0064e..d9797786a 100644
--- a/hicn-light/src/io/hicnConnection.c
+++ b/hicn-light/src/hicn/io/hicnConnection.c
@@ -21,21 +21,21 @@
  */
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <src/core/message.h>
-#include <src/io/hicnConnection.h>
+#include <hicn/core/message.h>
+#include <hicn/io/hicnConnection.h>
 
-#include <src/core/messageHandler.h>
+#include <hicn/core/messageHandler.h>
 
 #include <parc/algol/parc_Hash.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/core/connection.h>
-#include <src/core/forwarder.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/forwarder.h>
 
 typedef struct hicn_state {
   Forwarder *forwarder;
diff --git a/hicn-light/src/io/hicnConnection.h b/hicn-light/src/hicn/io/hicnConnection.h
index 930e2d470..a14024a4e 100644
--- a/hicn-light/src/io/hicnConnection.h
+++ b/hicn-light/src/hicn/io/hicnConnection.h
@@ -24,10 +24,10 @@
 #ifndef hicnConnection_h
 #define hicnConnection_h
 
-#include <src/core/forwarder.h>
-#include <src/io/addressPair.h>
-#include <src/io/ioOperations.h>
-#include <src/utils/address.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/io/addressPair.h>
+#include <hicn/io/ioOperations.h>
+#include <hicn/utils/address.h>
 
 /**
  * Creates a Hicn connection that can send to the remote address
diff --git a/hicn-light/src/io/hicnListener.c b/hicn-light/src/hicn/io/hicnListener.c
index bcf4de6a3..3f6cab94e 100644
--- a/hicn-light/src/io/hicnListener.c
+++ b/hicn-light/src/hicn/io/hicnListener.c
@@ -15,7 +15,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -23,25 +23,25 @@
 
 #include <unistd.h>
 
-#include <src/io/hicnConnection.h>
-#include <src/io/hicnListener.h>
+#include <hicn/io/hicnConnection.h>
+#include <hicn/io/hicnListener.h>
 
-#include <src/core/connection.h>
-#include <src/core/connectionTable.h>
-#include <src/core/forwarder.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/connectionTable.h>
+#include <hicn/core/forwarder.h>
 #ifdef WITH_MAPME
-#include <src/config/symbolicNameTable.h>
-#include <src/core/mapMe.h>
-#include <src/core/message.h>
-#include <src/io/hicnTunnel.h>
+#include <hicn/config/symbolicNameTable.h>
+#include <hicn/core/mapMe.h>
+#include <hicn/core/message.h>
+#include <hicn/io/hicnTunnel.h>
 #endif /* WITH_MAPME */
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/core/mapMe.h>
-#include <src/core/messagePacketType.h>
-#include <src/io/listener.h>
-#include <src/socket/api.h>
+#include <hicn/core/mapMe.h>
+#include <hicn/core/messagePacketType.h>
+#include <hicn/io/listener.h>
+#include <hicn/socket/api.h>
 
 #define IPv6 6
 #define IPv4 4
diff --git a/hicn-light/src/io/hicnListener.h b/hicn-light/src/hicn/io/hicnListener.h
index 5897d33ad..faf6ad6b8 100644
--- a/hicn-light/src/io/hicnListener.h
+++ b/hicn-light/src/hicn/io/hicnListener.h
@@ -23,9 +23,9 @@
 #ifndef hicnListener_h
 #define hicnListener_h
 
-#include <src/core/forwarder.h>
-#include <src/core/messageHandler.h>
-#include <src/io/listener.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/messageHandler.h>
+#include <hicn/io/listener.h>
 #include <stdlib.h>
 
 struct hicn_listener;
diff --git a/hicn-light/src/io/hicnTunnel.c b/hicn-light/src/hicn/io/hicnTunnel.c
index e55393137..f22c731c3 100644
--- a/hicn-light/src/io/hicnTunnel.c
+++ b/hicn-light/src/hicn/io/hicnTunnel.c
@@ -14,15 +14,15 @@
  */
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <parc/assert/parc_Assert.h>
-#include <src/io/hicnConnection.h>
-#include <src/io/hicnListener.h>
-#include <src/io/hicnTunnel.h>
+#include <hicn/io/hicnConnection.h>
+#include <hicn/io/hicnListener.h>
+#include <hicn/io/hicnTunnel.h>
 
 IoOperations *hicnTunnel_CreateOnListener(Forwarder *forwarder,
                                           ListenerOps *localListener,
diff --git a/hicn-light/src/io/hicnTunnel.h b/hicn-light/src/hicn/io/hicnTunnel.h
index 70295797c..1fe0b413c 100644
--- a/hicn-light/src/io/hicnTunnel.h
+++ b/hicn-light/src/hicn/io/hicnTunnel.h
@@ -25,10 +25,10 @@
 #ifndef hicnTunnel_h
 #define hicnTunnel_h
 
-#include <src/core/forwarder.h>
-#include <src/io/ioOperations.h>
-#include <src/io/listener.h>
-#include <src/utils/address.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/io/ioOperations.h>
+#include <hicn/io/listener.h>
+#include <hicn/utils/address.h>
 
 /**
  * Establishes a connection to a remote system over HICN
diff --git a/hicn-light/src/io/ioOperations.c b/hicn-light/src/hicn/io/ioOperations.c
index b40b51d76..53adc47c5 100644
--- a/hicn-light/src/io/ioOperations.c
+++ b/hicn-light/src/hicn/io/ioOperations.c
@@ -14,8 +14,8 @@
  */
 
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
-#include <src/io/ioOperations.h>
+#include <src/hicn/config.h>
+#include <hicn/io/ioOperations.h>
 #include <stdio.h>
 
 void *ioOperations_GetClosure(const IoOperations *ops) {
diff --git a/hicn-light/src/io/ioOperations.h b/hicn-light/src/hicn/io/ioOperations.h
index 48319c259..115b017dc 100644
--- a/hicn-light/src/io/ioOperations.h
+++ b/hicn-light/src/hicn/io/ioOperations.h
@@ -26,10 +26,10 @@
 #ifndef io_h
 #define io_h
 
-#include <src/core/message.h>
-#include <src/core/ticks.h>
-#include <src/io/addressPair.h>
-#include <src/utils/address.h>
+#include <hicn/core/message.h>
+#include <hicn/core/ticks.h>
+#include <hicn/io/addressPair.h>
+#include <hicn/utils/address.h>
 
 // packet types for probing
 #define PACKET_TYPE_PROBE_REQUEST 5
diff --git a/hicn-light/src/io/listener.h b/hicn-light/src/hicn/io/listener.h
index ffbb513fa..3d195ee88 100644
--- a/hicn-light/src/io/listener.h
+++ b/hicn-light/src/hicn/io/listener.h
@@ -26,7 +26,7 @@
 #ifndef listener_h
 #define listener_h
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 struct listener_ops;
 typedef struct listener_ops ListenerOps;
diff --git a/hicn-light/src/io/listenerSet.c b/hicn-light/src/hicn/io/listenerSet.c
index a890cd5b8..102496877 100644
--- a/hicn-light/src/io/listenerSet.c
+++ b/hicn-light/src/hicn/io/listenerSet.c
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_ArrayList.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/io/listenerSet.h>
+#include <hicn/io/listenerSet.h>
 
 struct listener_set {
   PARCArrayList *listOfListeners;
diff --git a/hicn-light/src/io/listenerSet.h b/hicn-light/src/hicn/io/listenerSet.h
index 671e68479..8d15a2736 100644
--- a/hicn-light/src/io/listenerSet.h
+++ b/hicn-light/src/hicn/io/listenerSet.h
@@ -30,7 +30,7 @@
 #ifndef listenerSet_h
 #define listenerSet_h
 
-#include <src/io/listener.h>
+#include <hicn/io/listener.h>
 
 struct listener_set;
 typedef struct listener_set ListenerSet;
diff --git a/hicn-light/src/io/streamConnection.c b/hicn-light/src/hicn/io/streamConnection.c
index 78c19fb18..d9ba5a355 100644
--- a/hicn-light/src/io/streamConnection.c
+++ b/hicn-light/src/hicn/io/streamConnection.c
@@ -18,22 +18,22 @@
  */
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <parc/algol/parc_Hash.h>
-#include <src/core/connection.h>
-#include <src/core/forwarder.h>
-#include <src/core/message.h>
-#include <src/io/streamConnection.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/message.h>
+#include <hicn/io/streamConnection.h>
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/core/messageHandler.h>
+#include <hicn/core/messageHandler.h>
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 #include <hicn/hicn.h>
 // 128 KB output queue
diff --git a/hicn-light/src/io/streamConnection.h b/hicn-light/src/hicn/io/streamConnection.h
index 8eb63a094..2b312e771 100644
--- a/hicn-light/src/io/streamConnection.h
+++ b/hicn-light/src/hicn/io/streamConnection.h
@@ -20,11 +20,11 @@
 #ifndef streamConnection_h
 #define streamConnection_h
 
-#include <src/core/forwarder.h>
-#include <src/core/messagePacketType.h>
-#include <src/io/addressPair.h>
-#include <src/io/ioOperations.h>
-#include <src/utils/address.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/messagePacketType.h>
+#include <hicn/io/addressPair.h>
+#include <hicn/io/ioOperations.h>
+#include <hicn/utils/address.h>
 
 /**
  * @function streamConnection_AcceptConnection
diff --git a/hicn-light/src/io/tcpListener.c b/hicn-light/src/hicn/io/tcpListener.c
index 6f0477f5b..7a89248cf 100644
--- a/hicn-light/src/io/tcpListener.c
+++ b/hicn-light/src/hicn/io/tcpListener.c
@@ -14,16 +14,16 @@
  */
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <src/core/connectionTable.h>
-#include <src/core/forwarder.h>
-#include <src/io/listener.h>
-#include <src/io/streamConnection.h>
-#include <src/io/tcpListener.h>
+#include <hicn/core/connectionTable.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/io/listener.h>
+#include <hicn/io/streamConnection.h>
+#include <hicn/io/tcpListener.h>
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
diff --git a/hicn-light/src/io/tcpListener.h b/hicn-light/src/hicn/io/tcpListener.h
index 9664b32b0..df0bbea1e 100644
--- a/hicn-light/src/io/tcpListener.h
+++ b/hicn-light/src/hicn/io/tcpListener.h
@@ -29,8 +29,8 @@
 #include <netinet/in.h>
 #endif
 
-#include <src/core/forwarder.h>
-#include <src/io/listener.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/io/listener.h>
 #include <stdlib.h>
 
 ListenerOps *tcpListener_CreateInet6(Forwarder *forwarder,
diff --git a/hicn-light/src/io/tcpTunnel.c b/hicn-light/src/hicn/io/tcpTunnel.c
index a2bf2bd30..710b88f5b 100644
--- a/hicn-light/src/io/tcpTunnel.c
+++ b/hicn-light/src/hicn/io/tcpTunnel.c
@@ -14,15 +14,15 @@
  */
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <parc/assert/parc_Assert.h>
-#include <src/io/streamConnection.h>
-#include <src/io/tcpListener.h>
-#include <src/io/tcpTunnel.h>
+#include <hicn/io/streamConnection.h>
+#include <hicn/io/tcpListener.h>
+#include <hicn/io/tcpTunnel.h>
 
 IoOperations *tcpTunnel_Create(Forwarder *forwarder,
                                const Address *localAddress,
diff --git a/hicn-light/src/io/tcpTunnel.h b/hicn-light/src/hicn/io/tcpTunnel.h
index 4daa7d032..d1d2a8524 100644
--- a/hicn-light/src/io/tcpTunnel.h
+++ b/hicn-light/src/hicn/io/tcpTunnel.h
@@ -22,10 +22,10 @@
 #ifndef tcpTunnel_h
 #define tcpTunnel_h
 
-#include <src/core/forwarder.h>
-#include <src/io/ioOperations.h>
-#include <src/io/listener.h>
-#include <src/utils/address.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/io/ioOperations.h>
+#include <hicn/io/listener.h>
+#include <hicn/utils/address.h>
 
 /**
  */
diff --git a/hicn-light/src/io/udpConnection.c b/hicn-light/src/hicn/io/udpConnection.c
index 5fbdf4998..b057f03ff 100644
--- a/hicn-light/src/io/udpConnection.c
+++ b/hicn-light/src/hicn/io/udpConnection.c
@@ -24,19 +24,19 @@
 #include <sys/uio.h>
 #endif
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <src/core/messageHandler.h>
-#include <src/io/udpConnection.h>
+#include <hicn/core/messageHandler.h>
+#include <hicn/io/udpConnection.h>
 
 #include <parc/algol/parc_Hash.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/core/connection.h>
-#include <src/core/forwarder.h>
-#include <src/core/message.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/message.h>
 
 typedef struct udp_state {
   Forwarder *forwarder;
diff --git a/hicn-light/src/io/udpConnection.h b/hicn-light/src/hicn/io/udpConnection.h
index 122f332d5..07c4da9bd 100644
--- a/hicn-light/src/io/udpConnection.h
+++ b/hicn-light/src/hicn/io/udpConnection.h
@@ -24,10 +24,10 @@
 #ifndef udpConnection_h
 #define udpConnection_h
 
-#include <src/core/forwarder.h>
-#include <src/io/addressPair.h>
-#include <src/io/ioOperations.h>
-#include <src/utils/address.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/io/addressPair.h>
+#include <hicn/io/ioOperations.h>
+#include <hicn/utils/address.h>
 
 /**
  * Creates a UDP connection that can send to the remote address
diff --git a/hicn-light/src/io/udpListener.c b/hicn-light/src/hicn/io/udpListener.c
index fefe116f9..e73896372 100644
--- a/hicn-light/src/io/udpListener.c
+++ b/hicn-light/src/hicn/io/udpListener.c
@@ -19,25 +19,25 @@
 #endif
 #include <errno.h>
 #include <fcntl.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <src/core/messageHandler.h>
+#include <hicn/core/messageHandler.h>
 
-#include <src/io/udpConnection.h>
-#include <src/io/udpListener.h>
+#include <hicn/io/udpConnection.h>
+#include <hicn/io/udpListener.h>
 
 #include <parc/algol/parc_Network.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/core/connection.h>
-#include <src/core/forwarder.h>
-#include <src/core/messagePacketType.h>
+#include <hicn/core/connection.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/messagePacketType.h>
 
 #ifdef WITH_MAPME
-#include <src/core/mapMe.h>
+#include <hicn/core/mapMe.h>
 #endif /* WITH_MAPME */
 
 #define IPv4 4
diff --git a/hicn-light/src/io/udpListener.h b/hicn-light/src/hicn/io/udpListener.h
index 14c03fd52..1ad3f77fe 100644
--- a/hicn-light/src/io/udpListener.h
+++ b/hicn-light/src/hicn/io/udpListener.h
@@ -20,8 +20,8 @@
 #include <netinet/in.h>
 #endif
 
-#include <src/core/forwarder.h>
-#include <src/io/listener.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/io/listener.h>
 #include <stdlib.h>
 
 struct udp_listener;
diff --git a/hicn-light/src/io/udpTunnel.c b/hicn-light/src/hicn/io/udpTunnel.c
index d49f43f05..79a15de41 100644
--- a/hicn-light/src/io/udpTunnel.c
+++ b/hicn-light/src/hicn/io/udpTunnel.c
@@ -14,16 +14,16 @@
  */
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <parc/algol/parc_Network.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/io/udpConnection.h>
-#include <src/io/udpListener.h>
-#include <src/io/udpTunnel.h>
+#include <hicn/io/udpConnection.h>
+#include <hicn/io/udpListener.h>
+#include <hicn/io/udpTunnel.h>
 
 IoOperations *udpTunnel_CreateOnListener(Forwarder *forwarder,
                                          ListenerOps *localListener,
diff --git a/hicn-light/src/io/udpTunnel.h b/hicn-light/src/hicn/io/udpTunnel.h
index a79ca4a4e..dacfdbb01 100644
--- a/hicn-light/src/io/udpTunnel.h
+++ b/hicn-light/src/hicn/io/udpTunnel.h
@@ -22,10 +22,10 @@
 #ifndef udpTunnel_h
 #define udpTunnel_h
 
-#include <src/core/forwarder.h>
-#include <src/io/ioOperations.h>
-#include <src/io/listener.h>
-#include <src/utils/address.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/io/ioOperations.h>
+#include <hicn/io/listener.h>
+#include <hicn/utils/address.h>
 
 /**
  */
diff --git a/hicn-light/src/messenger/CMakeLists.txt b/hicn-light/src/hicn/messenger/CMakeLists.txt
index 92bc13b5b..92bc13b5b 100644
--- a/hicn-light/src/messenger/CMakeLists.txt
+++ b/hicn-light/src/hicn/messenger/CMakeLists.txt
diff --git a/hicn-light/src/messenger/messenger.c b/hicn-light/src/hicn/messenger/messenger.c
index 26c7a85e2..201969ae2 100644
--- a/hicn-light/src/messenger/messenger.c
+++ b/hicn-light/src/hicn/messenger/messenger.c
@@ -33,11 +33,11 @@
 #include <parc/algol/parc_EventScheduler.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/messenger/messenger.h>
-#include <src/messenger/missiveDeque.h>
+#include <hicn/messenger/messenger.h>
+#include <hicn/messenger/missiveDeque.h>
 
 struct messenger {
   PARCArrayList *callbacklist;
diff --git a/hicn-light/src/messenger/messenger.h b/hicn-light/src/hicn/messenger/messenger.h
index f945e7e72..79d65cda6 100644
--- a/hicn-light/src/messenger/messenger.h
+++ b/hicn-light/src/hicn/messenger/messenger.h
@@ -24,9 +24,9 @@
 #ifndef messenger_h
 #define messenger_h
 
-#include <src/core/dispatcher.h>
-#include <src/messenger/messengerRecipient.h>
-#include <src/messenger/missive.h>
+#include <hicn/core/dispatcher.h>
+#include <hicn/messenger/messengerRecipient.h>
+#include <hicn/messenger/missive.h>
 
 struct messenger;
 typedef struct messenger Messenger;
diff --git a/hicn-light/src/messenger/messengerRecipient.c b/hicn-light/src/hicn/messenger/messengerRecipient.c
index 14251f8eb..684eebd6c 100644
--- a/hicn-light/src/messenger/messengerRecipient.c
+++ b/hicn-light/src/hicn/messenger/messengerRecipient.c
@@ -15,11 +15,11 @@
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/messenger/messenger.h>
-#include <src/messenger/messengerRecipient.h>
+#include <hicn/messenger/messenger.h>
+#include <hicn/messenger/messengerRecipient.h>
 
 struct messenger_recipient {
   void *context;
diff --git a/hicn-light/src/messenger/messengerRecipient.h b/hicn-light/src/hicn/messenger/messengerRecipient.h
index 66d8f40f5..cb5705b3a 100644
--- a/hicn-light/src/messenger/messengerRecipient.h
+++ b/hicn-light/src/hicn/messenger/messengerRecipient.h
@@ -36,7 +36,7 @@
 #ifndef messengerRecipient_h
 #define messengerRecipient_h
 
-#include <src/messenger/missive.h>
+#include <hicn/messenger/missive.h>
 
 struct messenger_recipient;
 typedef struct messenger_recipient MessengerRecipient;
diff --git a/hicn-light/src/messenger/missive.c b/hicn-light/src/hicn/messenger/missive.c
index a8bcb0282..8d332d96b 100644
--- a/hicn-light/src/messenger/missive.c
+++ b/hicn-light/src/hicn/messenger/missive.c
@@ -16,10 +16,10 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Object.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/messenger/missive.h>
+#include <hicn/messenger/missive.h>
 
 struct missive {
   MissiveType missiveType;
diff --git a/hicn-light/src/messenger/missive.h b/hicn-light/src/hicn/messenger/missive.h
index 33f3ef8b8..fdeddce83 100644
--- a/hicn-light/src/messenger/missive.h
+++ b/hicn-light/src/hicn/messenger/missive.h
@@ -25,7 +25,7 @@
 #ifndef missive_h
 #define missive_h
 
-#include <src/messenger/missiveType.h>
+#include <hicn/messenger/missiveType.h>
 
 struct missive;
 typedef struct missive Missive;
diff --git a/hicn-light/src/messenger/missiveDeque.c b/hicn-light/src/hicn/messenger/missiveDeque.c
index 418027d7a..c659d8685 100644
--- a/hicn-light/src/messenger/missiveDeque.c
+++ b/hicn-light/src/hicn/messenger/missiveDeque.c
@@ -22,11 +22,11 @@
 #include <parc/algol/parc_Deque.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/messenger/missive.h>
-#include <src/messenger/missiveDeque.h>
+#include <hicn/messenger/missive.h>
+#include <hicn/messenger/missiveDeque.h>
 
 struct missive_deque {
   PARCDeque *queue;
diff --git a/hicn-light/src/messenger/missiveDeque.h b/hicn-light/src/hicn/messenger/missiveDeque.h
index c6f955ce0..c6f955ce0 100644
--- a/hicn-light/src/messenger/missiveDeque.h
+++ b/hicn-light/src/hicn/messenger/missiveDeque.h
diff --git a/hicn-light/src/messenger/missiveType.h b/hicn-light/src/hicn/messenger/missiveType.h
index b0d9c7704..b0d9c7704 100644
--- a/hicn-light/src/messenger/missiveType.h
+++ b/hicn-light/src/hicn/messenger/missiveType.h
diff --git a/hicn-light/src/platforms/CMakeLists.txt b/hicn-light/src/hicn/platforms/CMakeLists.txt
index 191a72213..191a72213 100644
--- a/hicn-light/src/platforms/CMakeLists.txt
+++ b/hicn-light/src/hicn/platforms/CMakeLists.txt
diff --git a/hicn-light/src/platforms/README.txt b/hicn-light/src/hicn/platforms/README.txt
index a1293944c..a1293944c 100644
--- a/hicn-light/src/platforms/README.txt
+++ b/hicn-light/src/hicn/platforms/README.txt
diff --git a/hicn-light/src/platforms/android/system.c b/hicn-light/src/hicn/platforms/android/system.c
index 68f99424b..0cbe05b9c 100644
--- a/hicn-light/src/platforms/android/system.c
+++ b/hicn-light/src/hicn/platforms/android/system.c
@@ -14,7 +14,7 @@
  */
 
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,8 +31,8 @@
 // for the mac address
 #include <netpacket/packet.h>
 
-#include <src/core/forwarder.h>
-#include <src/utils/interfaceSet.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/utils/interfaceSet.h>
 
 #include <parc/assert/parc_Assert.h>
 
diff --git a/hicn-light/src/platforms/darwin/system.c b/hicn-light/src/hicn/platforms/darwin/system.c
index b8ef80c63..591e0507b 100644
--- a/hicn-light/src/platforms/darwin/system.c
+++ b/hicn-light/src/hicn/platforms/darwin/system.c
@@ -15,7 +15,7 @@
 
 #include <errno.h>
 #include <ifaddrs.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,10 +28,10 @@
 
 #include <parc/assert/parc_Assert.h>
 
-#include <src/utils/interfaceSet.h>
+#include <hicn/utils/interfaceSet.h>
 
-#include <src/core/forwarder.h>
-#include <src/core/system.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/system.h>
 
 InterfaceSet *system_Interfaces(Forwarder *forwarder) {
   InterfaceSet *set = interfaceSetCreate();
diff --git a/hicn-light/src/platforms/linux/system.c b/hicn-light/src/hicn/platforms/linux/system.c
index fcf13becc..996660dbf 100644
--- a/hicn-light/src/platforms/linux/system.c
+++ b/hicn-light/src/hicn/platforms/linux/system.c
@@ -15,7 +15,7 @@
 
 #include <errno.h>
 #include <ifaddrs.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,12 +32,12 @@
 // for the mac address
 #include <netpacket/packet.h>
 
-#include <src/core/forwarder.h>
-#include <src/utils/interfaceSet.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/utils/interfaceSet.h>
 
 #include <parc/assert/parc_Assert.h>
 
-#include <src/utils/addressList.h>
+#include <hicn/utils/addressList.h>
 
 /**
  * Returns the MTU for a named interface
diff --git a/hicn-light/src/platforms/windows/system.c b/hicn-light/src/hicn/platforms/windows/system.c
index a23b7d95e..df2a014a6 100644
--- a/hicn-light/src/platforms/windows/system.c
+++ b/hicn-light/src/hicn/platforms/windows/system.c
@@ -14,7 +14,7 @@
  */

 

 #include <parc/assert/parc_Assert.h>

-#include <src/config.h>

+#include <src/hicn/config.h>

 

 #include <stdio.h>

 #include <stdlib.h>

@@ -30,10 +30,10 @@
 #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))

 #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))

 

-#include <src/core/forwarder.h>

-#include <src/utils/interfaceSet.h>

+#include <hicn/core/forwarder.h>

+#include <hicn/utils/interfaceSet.h>

 

-#include <src/utils/addressList.h>

+#include <hicn/utils/addressList.h>

 

 /**

  * Returns the MTU for a named interface

diff --git a/hicn-light/src/platforms/windows/win_portability.c b/hicn-light/src/hicn/platforms/windows/win_portability.c
index cc592cd4b..3138640dd 100644
--- a/hicn-light/src/platforms/windows/win_portability.c
+++ b/hicn-light/src/hicn/platforms/windows/win_portability.c
@@ -15,7 +15,7 @@
 

 #pragma once

 

-#include <src/platforms/windows/win_portability.h>

+#include <hicn/platforms/windows/win_portability.h>

 

 int getline(char **lineptr, size_t *n, FILE *stream) {

   static char line[256];

diff --git a/hicn-light/src/platforms/windows/win_portability.h b/hicn-light/src/hicn/platforms/windows/win_portability.h
index 5c25f4bb2..5c25f4bb2 100644
--- a/hicn-light/src/platforms/windows/win_portability.h
+++ b/hicn-light/src/hicn/platforms/windows/win_portability.h
diff --git a/hicn-light/src/processor/CMakeLists.txt b/hicn-light/src/hicn/processor/CMakeLists.txt
index b7eeabe3b..b7eeabe3b 100644
--- a/hicn-light/src/processor/CMakeLists.txt
+++ b/hicn-light/src/hicn/processor/CMakeLists.txt
diff --git a/hicn-light/src/processor/fib.c b/hicn-light/src/hicn/processor/fib.c
index c7b1e2de2..e7a680f9c 100644
--- a/hicn-light/src/processor/fib.c
+++ b/hicn-light/src/hicn/processor/fib.c
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/processor/fib.h>
+#include <hicn/processor/fib.h>
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Network.h>
diff --git a/hicn-light/src/processor/fib.h b/hicn-light/src/hicn/processor/fib.h
index 4409419db..28ea19a0d 100644
--- a/hicn-light/src/processor/fib.h
+++ b/hicn-light/src/hicn/processor/fib.h
@@ -15,10 +15,10 @@
 #ifndef fib_h
 #define fib_h
 
-#include <src/core/message.h>
-#include <src/core/name.h>
-#include <src/processor/fibEntry.h>
-#include <src/processor/fibEntryList.h>
+#include <hicn/core/message.h>
+#include <hicn/core/name.h>
+#include <hicn/processor/fibEntry.h>
+#include <hicn/processor/fibEntryList.h>
 
 struct fib;
 typedef struct fib FIB;
diff --git a/hicn-light/src/processor/fibEntry.c b/hicn-light/src/hicn/processor/fibEntry.c
index 6d741e312..e32a1448c 100644
--- a/hicn-light/src/processor/fibEntry.c
+++ b/hicn-light/src/hicn/processor/fibEntry.c
@@ -13,28 +13,28 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/core/numberSet.h>
-#include <src/processor/fibEntry.h>
+#include <hicn/core/numberSet.h>
+#include <hicn/processor/fibEntry.h>
 
-#include <src/core/nameBitvector.h>
+#include <hicn/core/nameBitvector.h>
 
-#include <src/strategies/loadBalancer.h>
-#include <src/strategies/loadBalancerWithPD.h>
-#include <src/strategies/rnd.h>
-#include <src/strategies/rndSegment.h>
-#include <src/strategies/strategyImpl.h>
+#include <hicn/strategies/loadBalancer.h>
+#include <hicn/strategies/loadBalancerWithPD.h>
+#include <hicn/strategies/rnd.h>
+#include <hicn/strategies/rndSegment.h>
+#include <hicn/strategies/strategyImpl.h>
 #ifdef WITH_MAPME
 #include <parc/algol/parc_HashMap.h>
-#include <src/core/ticks.h>
+#include <hicn/core/ticks.h>
 #endif /* WITH_MAPME */
 
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 struct fib_entry {
   Name *name;
diff --git a/hicn-light/src/processor/fibEntry.h b/hicn-light/src/hicn/processor/fibEntry.h
index 3bcac3884..d677ae998 100644
--- a/hicn-light/src/processor/fibEntry.h
+++ b/hicn-light/src/hicn/processor/fibEntry.h
@@ -37,8 +37,8 @@
 #ifndef fibEntry_h
 #define fibEntry_h
 
-#include <src/core/name.h>
-#include <src/strategies/strategyImpl.h>
+#include <hicn/core/name.h>
+#include <hicn/strategies/strategyImpl.h>
 
 #ifdef WITH_MAPME
 #include <parc/algol/parc_EventTimer.h>
diff --git a/hicn-light/src/processor/fibEntryList.c b/hicn-light/src/hicn/processor/fibEntryList.c
index 2221fa614..1b9257bbc 100644
--- a/hicn-light/src/processor/fibEntryList.c
+++ b/hicn-light/src/hicn/processor/fibEntryList.c
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <parc/algol/parc_ArrayList.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
-#include <src/processor/fibEntryList.h>
+#include <hicn/processor/fibEntryList.h>
 
 struct fib_entry_list {
   PARCArrayList *listOfFibEntries;
diff --git a/hicn-light/src/processor/fibEntryList.h b/hicn-light/src/hicn/processor/fibEntryList.h
index 0f6066435..072a1b369 100644
--- a/hicn-light/src/processor/fibEntryList.h
+++ b/hicn-light/src/hicn/processor/fibEntryList.h
@@ -24,7 +24,7 @@
 #ifndef fibEntryList_h
 #define fibEntryList_h
 
-#include <src/processor/fibEntry.h>
+#include <hicn/processor/fibEntry.h>
 
 struct fib_entry_list;
 typedef struct fib_entry_list FibEntryList;
diff --git a/hicn-light/src/processor/hashTableFunction.c b/hicn-light/src/hicn/processor/hashTableFunction.c
index 6e70ef91a..2272f0ede 100644
--- a/hicn-light/src/processor/hashTableFunction.c
+++ b/hicn-light/src/hicn/processor/hashTableFunction.c
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_Hash.h>
 #include <parc/algol/parc_Memory.h>
 
-#include <src/core/message.h>
-#include <src/processor/hashTableFunction.h>
+#include <hicn/core/message.h>
+#include <hicn/processor/hashTableFunction.h>
 
 #include <parc/assert/parc_Assert.h>
 
diff --git a/hicn-light/src/processor/hashTableFunction.h b/hicn-light/src/hicn/processor/hashTableFunction.h
index eb9989086..eb9989086 100644
--- a/hicn-light/src/processor/hashTableFunction.h
+++ b/hicn-light/src/hicn/processor/hashTableFunction.h
diff --git a/hicn-light/src/processor/matchingRulesTable.c b/hicn-light/src/hicn/processor/matchingRulesTable.c
index 56e59c29e..a035f5890 100644
--- a/hicn-light/src/processor/matchingRulesTable.c
+++ b/hicn-light/src/hicn/processor/matchingRulesTable.c
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_Hash.h>
 #include <parc/algol/parc_Memory.h>
 
 #include <parc/assert/parc_Assert.h>
-#include <src/processor/hashTableFunction.h>
-#include <src/processor/matchingRulesTable.h>
+#include <hicn/processor/hashTableFunction.h>
+#include <hicn/processor/matchingRulesTable.h>
 
 struct matching_rules_table {
   // using this wrapper we can manatain multiple hash tables indexed in
diff --git a/hicn-light/src/processor/matchingRulesTable.h b/hicn-light/src/hicn/processor/matchingRulesTable.h
index 96d099430..64a57d854 100644
--- a/hicn-light/src/processor/matchingRulesTable.h
+++ b/hicn-light/src/hicn/processor/matchingRulesTable.h
@@ -38,7 +38,7 @@
 
 #include <parc/algol/parc_ArrayList.h>
 #include <parc/algol/parc_HashCodeTable.h>
-#include <src/core/message.h>
+#include <hicn/core/message.h>
 
 struct matching_rules_table;
 typedef struct matching_rules_table MatchingRulesTable;
diff --git a/hicn-light/src/processor/messageProcessor.c b/hicn-light/src/hicn/processor/messageProcessor.c
index 8c03ee739..f4c71a0b6 100644
--- a/hicn-light/src/processor/messageProcessor.c
+++ b/hicn-light/src/hicn/processor/messageProcessor.c
@@ -13,35 +13,35 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <parc/algol/parc_ArrayList.h>
 #include <parc/algol/parc_Memory.h>
-#include <src/processor/messageProcessor.h>
+#include <hicn/processor/messageProcessor.h>
 
-#include <src/processor/fib.h>
-#include <src/processor/pitStandard.h>
+#include <hicn/processor/fib.h>
+#include <hicn/processor/pitStandard.h>
 
-#include <src/content_store/contentStoreInterface.h>
-#include <src/content_store/contentStoreLRU.h>
+#include <hicn/content_store/contentStoreInterface.h>
+#include <hicn/content_store/contentStoreLRU.h>
 
-#include <src/strategies/loadBalancer.h>
-#include <src/strategies/loadBalancerWithPD.h>
-#include <src/strategies/rnd.h>
-#include <src/strategies/rndSegment.h>
-#include <src/strategies/strategyImpl.h>
+#include <hicn/strategies/loadBalancer.h>
+#include <hicn/strategies/loadBalancerWithPD.h>
+#include <hicn/strategies/rnd.h>
+#include <hicn/strategies/rndSegment.h>
+#include <hicn/strategies/strategyImpl.h>
 
-#include <src/io/streamConnection.h>
-#include <src/io/udpListener.h>
+#include <hicn/io/streamConnection.h>
+#include <hicn/io/udpListener.h>
 
 #include <parc/assert/parc_Assert.h>
 
-#include <src/utils/commands.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/commands.h>
+#include <hicn/utils/utils.h>
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 /*
  * Copyright (c) 2017-2019 Cisco and/or its affiliates.
diff --git a/hicn-light/src/processor/messageProcessor.h b/hicn-light/src/hicn/processor/messageProcessor.h
index ce3049938..64b08272d 100644
--- a/hicn-light/src/processor/messageProcessor.h
+++ b/hicn-light/src/hicn/processor/messageProcessor.h
@@ -26,11 +26,11 @@
 #ifndef messageProcessor_h
 #define messageProcessor_h
 
-#include <src/content_store/contentStoreInterface.h>
-#include <src/core/forwarder.h>
-#include <src/core/message.h>
+#include <hicn/content_store/contentStoreInterface.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/message.h>
 
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 struct message_processor;
 typedef struct message_processor MessageProcessor;
diff --git a/hicn-light/src/processor/pit.c b/hicn-light/src/hicn/processor/pit.c
index 9cae4062e..948291286 100644
--- a/hicn-light/src/processor/pit.c
+++ b/hicn-light/src/hicn/processor/pit.c
@@ -19,10 +19,10 @@
  */
 
 #include <parc/assert/parc_Assert.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/processor/pit.h>
+#include <hicn/processor/pit.h>
 
 void *pit_Closure(const PIT *pit) { return pit->closure; }
 
diff --git a/hicn-light/src/processor/pit.h b/hicn-light/src/hicn/processor/pit.h
index 1f909be3e..63a9b20e4 100644
--- a/hicn-light/src/processor/pit.h
+++ b/hicn-light/src/hicn/processor/pit.h
@@ -24,11 +24,11 @@
 #ifndef pit_h
 #define pit_h
 
-#include <src/core/forwarder.h>
-#include <src/core/message.h>
-#include <src/core/numberSet.h>
-#include <src/processor/pitEntry.h>
-#include <src/processor/pitVerdict.h>
+#include <hicn/core/forwarder.h>
+#include <hicn/core/message.h>
+#include <hicn/core/numberSet.h>
+#include <hicn/processor/pitEntry.h>
+#include <hicn/processor/pitVerdict.h>
 
 struct pit;
 typedef struct pit PIT;
diff --git a/hicn-light/src/processor/pitEntry.c b/hicn-light/src/hicn/processor/pitEntry.c
index 38103cb8e..abc1dbcff 100644
--- a/hicn-light/src/processor/pitEntry.c
+++ b/hicn-light/src/hicn/processor/pitEntry.c
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_Memory.h>
-#include <src/core/numberSet.h>
-#include <src/processor/pitEntry.h>
+#include <hicn/core/numberSet.h>
+#include <hicn/processor/pitEntry.h>
 
 #include <parc/assert/parc_Assert.h>
 
diff --git a/hicn-light/src/processor/pitEntry.h b/hicn-light/src/hicn/processor/pitEntry.h
index b7d45e6a4..3cd5821bc 100644
--- a/hicn-light/src/processor/pitEntry.h
+++ b/hicn-light/src/hicn/processor/pitEntry.h
@@ -24,10 +24,10 @@
 #ifndef pitEntry_h
 #define pitEntry_h
 
-#include <src/core/message.h>
-#include <src/core/numberSet.h>
-#include <src/core/ticks.h>
-#include <src/processor/fibEntry.h>
+#include <hicn/core/message.h>
+#include <hicn/core/numberSet.h>
+#include <hicn/core/ticks.h>
+#include <hicn/processor/fibEntry.h>
 
 struct pit_entry;
 typedef struct pit_entry PitEntry;
diff --git a/hicn-light/src/processor/pitStandard.c b/hicn-light/src/hicn/processor/pitStandard.c
index 8d507626a..1574f70ab 100644
--- a/hicn-light/src/processor/pitStandard.c
+++ b/hicn-light/src/hicn/processor/pitStandard.c
@@ -29,22 +29,22 @@
  *
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
-#include <src/processor/hashTableFunction.h>
-#include <src/processor/pit.h>
+#include <hicn/processor/hashTableFunction.h>
+#include <hicn/processor/pit.h>
 
-#include <src/core/ticks.h>
+#include <hicn/core/ticks.h>
 
 #include <parc/algol/parc_Hash.h>
 #include <parc/algol/parc_HashCodeTable.h>
 #include <parc/algol/parc_Memory.h>
 
-#include <src/core/forwarder.h>
+#include <hicn/core/forwarder.h>
 
 #include <parc/assert/parc_Assert.h>
 
diff --git a/hicn-light/src/processor/pitStandard.h b/hicn-light/src/hicn/processor/pitStandard.h
index b9ba026c8..9d7ce6a23 100644
--- a/hicn-light/src/processor/pitStandard.h
+++ b/hicn-light/src/hicn/processor/pitStandard.h
@@ -24,7 +24,7 @@
 #ifndef pitStandard_h
 #define pitStandard_h
 
-#include <src/processor/pit.h>
+#include <hicn/processor/pit.h>
 
 /**
  * Creates a PIT table
diff --git a/hicn-light/src/processor/pitVerdict.h b/hicn-light/src/hicn/processor/pitVerdict.h
index 16631fa51..16631fa51 100644
--- a/hicn-light/src/processor/pitVerdict.h
+++ b/hicn-light/src/hicn/processor/pitVerdict.h
diff --git a/hicn-light/src/socket/CMakeLists.txt b/hicn-light/src/hicn/socket/CMakeLists.txt
index 6ea94dcfa..6ea94dcfa 100644
--- a/hicn-light/src/socket/CMakeLists.txt
+++ b/hicn-light/src/hicn/socket/CMakeLists.txt
diff --git a/hicn-light/src/socket/api.c b/hicn-light/src/hicn/socket/api.c
index aede01efe..aede01efe 100644
--- a/hicn-light/src/socket/api.c
+++ b/hicn-light/src/hicn/socket/api.c
diff --git a/hicn-light/src/socket/api.h b/hicn-light/src/hicn/socket/api.h
index 3a1ae92b4..3a1ae92b4 100644
--- a/hicn-light/src/socket/api.h
+++ b/hicn-light/src/hicn/socket/api.h
diff --git a/hicn-light/src/socket/error.c b/hicn-light/src/hicn/socket/error.c
index 3dafec8cf..3dafec8cf 100644
--- a/hicn-light/src/socket/error.c
+++ b/hicn-light/src/hicn/socket/error.c
diff --git a/hicn-light/src/socket/error.h b/hicn-light/src/hicn/socket/error.h
index 8195efd84..8195efd84 100644
--- a/hicn-light/src/socket/error.h
+++ b/hicn-light/src/hicn/socket/error.h
diff --git a/hicn-light/src/socket/ops.h b/hicn-light/src/hicn/socket/ops.h
index 249caf87a..249caf87a 100644
--- a/hicn-light/src/socket/ops.h
+++ b/hicn-light/src/hicn/socket/ops.h
diff --git a/hicn-light/src/socket/ops_linux.c b/hicn-light/src/hicn/socket/ops_linux.c
index d085f0d3d..d085f0d3d 100644
--- a/hicn-light/src/socket/ops_linux.c
+++ b/hicn-light/src/hicn/socket/ops_linux.c
diff --git a/hicn-light/src/strategies/CMakeLists.txt b/hicn-light/src/hicn/strategies/CMakeLists.txt
index 7f0730b2f..7f0730b2f 100644
--- a/hicn-light/src/strategies/CMakeLists.txt
+++ b/hicn-light/src/hicn/strategies/CMakeLists.txt
diff --git a/hicn-light/src/strategies/loadBalancer.c b/hicn-light/src/hicn/strategies/loadBalancer.c
index 8dda98603..cdf4f5165 100644
--- a/hicn-light/src/strategies/loadBalancer.c
+++ b/hicn-light/src/hicn/strategies/loadBalancer.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,8 +26,8 @@
 #include <parc/algol/parc_Object.h>
 #include <parc/algol/parc_Unsigned.h>
 
-#include <src/strategies/loadBalancer.h>
-#include <src/strategies/nexthopState.h>
+#include <hicn/strategies/loadBalancer.h>
+#include <hicn/strategies/nexthopState.h>
 
 static void _strategyLoadBalancer_ReceiveObject(StrategyImpl *strategy,
                                                 const NumberSet *egressId,
diff --git a/hicn-light/src/strategies/loadBalancer.h b/hicn-light/src/hicn/strategies/loadBalancer.h
index 1178c30fe..d0f4faece 100644
--- a/hicn-light/src/strategies/loadBalancer.h
+++ b/hicn-light/src/hicn/strategies/loadBalancer.h
@@ -20,7 +20,7 @@
 #ifndef loadBalancer_h
 #define loadBalancer_h
 
-#include <src/strategies/strategyImpl.h>
+#include <hicn/strategies/strategyImpl.h>
 
 StrategyImpl *strategyLoadBalancer_Create();
 #endif  // loadBalancer_h
diff --git a/hicn-light/src/strategies/loadBalancerWithPD.c b/hicn-light/src/hicn/strategies/loadBalancerWithPD.c
index c9c1479a2..acd466866 100644
--- a/hicn-light/src/strategies/loadBalancerWithPD.c
+++ b/hicn-light/src/hicn/strategies/loadBalancerWithPD.c
@@ -14,7 +14,7 @@
  */
 
 #include <limits.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,8 +27,8 @@
 #include <parc/algol/parc_Object.h>
 #include <parc/algol/parc_Unsigned.h>
 
-#include <src/strategies/loadBalancerWithPD.h>
-#include <src/strategies/nexthopStateWithPD.h>
+#include <hicn/strategies/loadBalancerWithPD.h>
+#include <hicn/strategies/nexthopStateWithPD.h>
 
 const unsigned PROBE_FREQUENCY = 1024;
 
diff --git a/hicn-light/src/strategies/loadBalancerWithPD.h b/hicn-light/src/hicn/strategies/loadBalancerWithPD.h
index 6ea7f0785..d8a215913 100644
--- a/hicn-light/src/strategies/loadBalancerWithPD.h
+++ b/hicn-light/src/hicn/strategies/loadBalancerWithPD.h
@@ -21,8 +21,8 @@
 #ifndef loadBalancerWithPD_h
 #define loadBalancerWithPD_h
 
-#include <src/core/connectionTable.h>
-#include <src/strategies/strategyImpl.h>
+#include <hicn/core/connectionTable.h>
+#include <hicn/strategies/strategyImpl.h>
 
 StrategyImpl *strategyLoadBalancerWithPD_Create();
 void strategyLoadBalancerWithPD_SetConnectionTable(StrategyImpl *strategy,
diff --git a/hicn-light/src/strategies/nexthopState.c b/hicn-light/src/hicn/strategies/nexthopState.c
index ef0ffe982..13c7dbe7a 100644
--- a/hicn-light/src/strategies/nexthopState.c
+++ b/hicn-light/src/hicn/strategies/nexthopState.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_DisplayIndented.h>
@@ -21,7 +21,7 @@
 #include <parc/algol/parc_Object.h>
 
 #include <parc/assert/parc_Assert.h>
-#include <src/strategies/nexthopState.h>
+#include <hicn/strategies/nexthopState.h>
 
 struct strategy_nexthop_state {
   unsigned int pi;
diff --git a/hicn-light/src/strategies/nexthopState.h b/hicn-light/src/hicn/strategies/nexthopState.h
index 35a9f497b..35a9f497b 100644
--- a/hicn-light/src/strategies/nexthopState.h
+++ b/hicn-light/src/hicn/strategies/nexthopState.h
diff --git a/hicn-light/src/strategies/nexthopStateWithPD.c b/hicn-light/src/hicn/strategies/nexthopStateWithPD.c
index 2eecb0c64..ac23de289 100644
--- a/hicn-light/src/strategies/nexthopStateWithPD.c
+++ b/hicn-light/src/hicn/strategies/nexthopStateWithPD.c
@@ -15,7 +15,7 @@
 
 #include <float.h>
 #include <limits.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/algol/parc_DisplayIndented.h>
@@ -23,7 +23,7 @@
 #include <parc/algol/parc_Object.h>
 #include <parc/assert/parc_Assert.h>
 
-#include <src/strategies/nexthopStateWithPD.h>
+#include <hicn/strategies/nexthopStateWithPD.h>
 
 struct strategy_nexthop_state_with_pd {
   unsigned int pi;
diff --git a/hicn-light/src/strategies/nexthopStateWithPD.h b/hicn-light/src/hicn/strategies/nexthopStateWithPD.h
index 4d8bd6d15..4d8bd6d15 100644
--- a/hicn-light/src/strategies/nexthopStateWithPD.h
+++ b/hicn-light/src/hicn/strategies/nexthopStateWithPD.h
diff --git a/hicn-light/src/strategies/rnd.c b/hicn-light/src/hicn/strategies/rnd.c
index 35b9e87c6..e797bb4d9 100644
--- a/hicn-light/src/strategies/rnd.c
+++ b/hicn-light/src/hicn/strategies/rnd.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,7 +24,7 @@
 #include <parc/algol/parc_HashMap.h>
 #include <parc/algol/parc_Memory.h>
 
-#include <src/strategies/rnd.h>
+#include <hicn/strategies/rnd.h>
 
 static void _strategyRnd_ReceiveObject(StrategyImpl *strategy,
                                        const NumberSet *egressId,
diff --git a/hicn-light/src/strategies/rnd.h b/hicn-light/src/hicn/strategies/rnd.h
index 69bedc1a5..b57b41ccf 100644
--- a/hicn-light/src/strategies/rnd.h
+++ b/hicn-light/src/hicn/strategies/rnd.h
@@ -20,7 +20,7 @@
 #ifndef rnd_h
 #define rnd_h
 
-#include <src/strategies/strategyImpl.h>
+#include <hicn/strategies/strategyImpl.h>
 
 StrategyImpl* strategyRnd_Create();
 #endif  // rnd_h
diff --git a/hicn-light/src/strategies/rndSegment.c b/hicn-light/src/hicn/strategies/rndSegment.c
index 5ed9bf1a9..ca1cffefc 100644
--- a/hicn-light/src/strategies/rndSegment.c
+++ b/hicn-light/src/hicn/strategies/rndSegment.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -23,8 +23,8 @@
 
 #include <parc/algol/parc_HashMap.h>
 #include <parc/algol/parc_Memory.h>
-#include <src/core/nameBitvector.h>
-#include <src/strategies/rndSegment.h>
+#include <hicn/core/nameBitvector.h>
+#include <hicn/strategies/rndSegment.h>
 
 static void _strategyRndSegment_ReceiveObject(StrategyImpl *strategy,
                                               const NumberSet *egressId,
diff --git a/hicn-light/src/strategies/rndSegment.h b/hicn-light/src/hicn/strategies/rndSegment.h
index 0749692f7..897ccca47 100644
--- a/hicn-light/src/strategies/rndSegment.h
+++ b/hicn-light/src/hicn/strategies/rndSegment.h
@@ -21,7 +21,7 @@
 #ifndef rnd_Segment_h
 #define rnd_Segment_h
 
-#include <src/strategies/strategyImpl.h>
+#include <hicn/strategies/strategyImpl.h>
 
 StrategyImpl* strategyRndSegment_Create();
 #endif  // rnd_Segment_h
diff --git a/hicn-light/src/strategies/strategyImpl.h b/hicn-light/src/hicn/strategies/strategyImpl.h
index c089e0b2b..2634665eb 100644
--- a/hicn-light/src/strategies/strategyImpl.h
+++ b/hicn-light/src/hicn/strategies/strategyImpl.h
@@ -28,8 +28,8 @@
 #ifndef strategyImpl_h
 #define strategyImpl_h
 
-#include <src/core/message.h>
-#include <src/core/numberSet.h>
+#include <hicn/core/message.h>
+#include <hicn/core/numberSet.h>
 
 struct strategy_impl;
 typedef struct strategy_impl StrategyImpl;
diff --git a/hicn-light/src/utils/CMakeLists.txt b/hicn-light/src/hicn/utils/CMakeLists.txt
index 120061211..120061211 100644
--- a/hicn-light/src/utils/CMakeLists.txt
+++ b/hicn-light/src/hicn/utils/CMakeLists.txt
diff --git a/hicn-light/src/utils/address.c b/hicn-light/src/hicn/utils/address.c
index a59c6a59d..fe222a43c 100644
--- a/hicn-light/src/utils/address.c
+++ b/hicn-light/src/hicn/utils/address.c
@@ -18,10 +18,10 @@
 #include <unistd.h>
 #endif
 #include <errno.h>
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 #include <parc/algol/parc_Base64.h>
 #include <parc/algol/parc_BufferComposer.h>
diff --git a/hicn-light/src/utils/address.h b/hicn-light/src/hicn/utils/address.h
index ca3141ede..6ca98347a 100644
--- a/hicn-light/src/utils/address.h
+++ b/hicn-light/src/hicn/utils/address.h
@@ -41,7 +41,7 @@
 
 #include <parc/algol/parc_Buffer.h>
 #include <parc/algol/parc_BufferComposer.h>
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 /**
  * Return a string representation of the given `address_type`
diff --git a/hicn-light/src/utils/addressList.c b/hicn-light/src/hicn/utils/addressList.c
index 4f51a11bf..434ceb7ca 100644
--- a/hicn-light/src/utils/addressList.c
+++ b/hicn-light/src/hicn/utils/addressList.c
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/assert/parc_Assert.h>
 
-#include <src/utils/addressList.h>
+#include <hicn/utils/addressList.h>
 
 #include <parc/algol/parc_ArrayList.h>
 #include <parc/algol/parc_Buffer.h>
diff --git a/hicn-light/src/utils/addressList.h b/hicn-light/src/hicn/utils/addressList.h
index bcb312c14..823b0c8cb 100644
--- a/hicn-light/src/utils/addressList.h
+++ b/hicn-light/src/hicn/utils/addressList.h
@@ -23,7 +23,7 @@
 #ifndef address_list_h
 #define address_list_h
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 struct address_list;
 /**
diff --git a/hicn-light/src/utils/commands.h b/hicn-light/src/hicn/utils/commands.h
index 9527e5064..9527e5064 100644
--- a/hicn-light/src/utils/commands.h
+++ b/hicn-light/src/hicn/utils/commands.h
diff --git a/hicn-light/src/utils/interface.c b/hicn-light/src/hicn/utils/interface.c
index ab7a88f0f..dce9ed8f3 100644
--- a/hicn-light/src/utils/interface.c
+++ b/hicn-light/src/hicn/utils/interface.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -22,11 +22,11 @@
 #include <parc/algol/parc_BufferComposer.h>
 #include <parc/algol/parc_Memory.h>
 #include <parc/algol/parc_Object.h>
-#include <src/utils/addressList.h>
-#include <src/utils/interface.h>
+#include <hicn/utils/addressList.h>
+#include <hicn/utils/interface.h>
 
 #include <parc/assert/parc_Assert.h>
-#include <src/utils/commands.h>
+#include <hicn/utils/commands.h>
 
 struct interface {
   char *name;
diff --git a/hicn-light/src/utils/interface.h b/hicn-light/src/hicn/utils/interface.h
index 0810ec053..fd91edb1d 100644
--- a/hicn-light/src/utils/interface.h
+++ b/hicn-light/src/hicn/utils/interface.h
@@ -22,8 +22,8 @@
 #ifndef interface_h
 #define interface_h
 
-#include <src/utils/address.h>
-#include <src/utils/addressList.h>
+#include <hicn/utils/address.h>
+#include <hicn/utils/addressList.h>
 
 struct interface;
 typedef struct interface Interface;
diff --git a/hicn-light/src/utils/interfaceSet.c b/hicn-light/src/hicn/utils/interfaceSet.c
index 3f56ec167..35c97812b 100644
--- a/hicn-light/src/utils/interfaceSet.c
+++ b/hicn-light/src/hicn/utils/interfaceSet.c
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
-#include <src/utils/interfaceSet.h>
+#include <hicn/utils/interfaceSet.h>
 
 #include <parc/algol/parc_ArrayList.h>
 #include <parc/algol/parc_Memory.h>
diff --git a/hicn-light/src/utils/interfaceSet.h b/hicn-light/src/hicn/utils/interfaceSet.h
index 8eb8397fb..e43f985fe 100644
--- a/hicn-light/src/utils/interfaceSet.h
+++ b/hicn-light/src/hicn/utils/interfaceSet.h
@@ -22,7 +22,7 @@
 #ifndef InterfaceSet_h
 #define InterfaceSet_h
 
-#include <src/utils/interface.h>
+#include <hicn/utils/interface.h>
 
 struct interfaceSet;
 /**
diff --git a/hicn-light/src/utils/punting.c b/hicn-light/src/hicn/utils/punting.c
index 9352732fe..06466172c 100644
--- a/hicn-light/src/utils/punting.c
+++ b/hicn-light/src/hicn/utils/punting.c
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-#include <src/config.h>
+#include <src/hicn/config.h>
 #include <stdio.h>
 
 #include <parc/assert/parc_Assert.h>
 
 #include <parc/algol/parc_Memory.h>
-#include <src/utils/punting.h>
+#include <hicn/utils/punting.h>
 
 struct punting {
   char *symbolic;
diff --git a/hicn-light/src/utils/punting.h b/hicn-light/src/hicn/utils/punting.h
index 03841c5ad..9be1baed4 100644
--- a/hicn-light/src/utils/punting.h
+++ b/hicn-light/src/hicn/utils/punting.h
@@ -19,7 +19,7 @@
 struct punting;
 typedef struct punting Punting;
 
-#include <src/utils/address.h>
+#include <hicn/utils/address.h>
 
 /**
  * Creates a Punting object
diff --git a/hicn-light/src/utils/utils.c b/hicn-light/src/hicn/utils/utils.c
index e40b219fb..61ff9a904 100644
--- a/hicn-light/src/utils/utils.c
+++ b/hicn-light/src/hicn/utils/utils.c
@@ -14,7 +14,7 @@
 #include <parc/algol/parc_Network.h>
 #include <parc/assert/parc_Assert.h>
 #include <pthread.h>
-#include <src/utils/utils.h>
+#include <hicn/utils/utils.h>
 
 // This is the unique sequence number used by all messages and its thread locks
 static pthread_mutex_t nextSequenceNumberMutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/hicn-light/src/utils/utils.h b/hicn-light/src/hicn/utils/utils.h
index 2c4efa965..ce8cb4e17 100644
--- a/hicn-light/src/utils/utils.h
+++ b/hicn-light/src/hicn/utils/utils.h
@@ -16,9 +16,9 @@
 #ifndef utils_h
 #define utils_h
 
-#include <src/config/controlState.h>
-#include <src/utils/address.h>
-#include <src/utils/commands.h>
+#include <hicn/config/controlState.h>
+#include <hicn/utils/address.h>
+#include <hicn/utils/commands.h>
 
 /**
  * Return true if string is purely an integer