diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index d48a208b..00000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-DIAGRAMS_SRC := $(wildcard diagrams/*.puml)
-DIAGRAMS_SVG := $(addsuffix .svg, $(basename $(DIAGRAMS_SRC)))
-DIAGRAMS_PNG := $(addsuffix .png, $(basename $(DIAGRAMS_SRC)))
-
-DOT_FILES_SRC := $(wildcard dot_files/*.dot)
-DOT_FILES_SVG := $(addsuffix .svg, $(basename $(DOT_FILES_SRC)))
-DOT_FILES_PNG := $(addsuffix .png, $(basename $(DOT_FILES_SRC)))
-
-# Default target first; build SVGs
-svg: $(DIAGRAMS_SVG) $(DOT_FILES_SVG)
-png: $(DIAGRAMS_PNG) $(DOT_FILES_PNG)
-
-
-diagrams/%.svg: diagrams/%.puml
- plantuml -tsvg $^
-
-diagrams/%.png: diagrams/%.puml
- plantuml -tpng $^
-
-dot_files/%.svg: dot_files/%.dot
- dot -Tsvg $^ -o $(basename $^).svg
-
-dot_files/%.png: dot_files/%.dot
- dot -Tpng $^ -o $(basename $^).png
-
-clean:
- rm -f $(DIAGRAMS_PNG) $(DIAGRAMS_SVG) $(DOT_FILES_PNG) $(DOT_FILES_SVG)
-
-.PHONY: png svg clean
diff --git a/doc/dot_files/ergw_flow_syntax.dot b/doc/dot_files/ergw_flow_syntax.dot
deleted file mode 100644
index 694cabf0..00000000
--- a/doc/dot_files/ergw_flow_syntax.dot
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Version: 0.0.1, Date:2019-12-23, Status: Always Draft */
-/* Not that readable, but good master file to produce smaller feature diagrams */
-/* Download graphwiz, and run dot cmd -> */
-/* 'dot -Tsvg ergw_flow_syntax.dot -o ergw_flow_syntax.svg' */
-digraph ergw_flow_syntax {
-{
-node [shape=oval style=filled]
-"3gpp_qos" [fillcolor=yellow]
-ergw [fillcolor=lavenderblush]
-ergw_api [fillcolor=lavenderblush]
-ergw_app [fillcolor=lavenderblush]
-ergw_cache [fillcolor=yellow]
-ergw_charging [fillcolor=lavenderblush]
-ergw_config [fillcolor=lavenderblush]
-ergw_context [fillcolor=lavenderblush]
-ergw_control [fillcolor=beige]
-ergw_gsn_lib [fillcolor=yellowgreen]
-ergw_gtp_c_socket [fillcolor=plum]
-ergw_gtp_socket [fillcolor=plum]
-ergw_gtp_socket_reg [fillcolor=yellow]
-ergw_gtp_socket_sup [fillcolor=azure]
-ergw_gtp_u_socket [fillcolor=plum]
-ergw_http_api [fillcolor=lavenderblush]
-ergw_inet [fillcolor=yellow]
-ergw_ip_pool [fillcolor=brown]
-ergw_ip_pool_reg [fillcolor=brown]
-ergw_ip_pool_sup [fillcolor=azure]
-ergw_node_selection[fillcolor=brown]
-ergw_pfcp [fillcolor=lavenderblush]
-ergw_prometheus [fillcolor=yellow]
-ergw_proxy_lib [fillcolor=yellowgreen]
-ergw_sup [fillcolor=azure]
-ergw_sx_node [fillcolor=tomato]
-ergw_sx_node_mngr [fillcolor=tomato]
-ergw_sx_node_reg [fillcolor=yellow]
-ergw_sx_node_sup [fillcolor=azure]
-ergw_sx_socket [fillcolor=tomato]
-ggsn_gn [fillcolor=bisque]
-ggsn_gn_proxy [fillcolor=bisque3]
-gtp_c_lib [fillcolor=yellow]
-gtp_config [fillcolor=yellow]
-gtp_context [fillcolor=moccasin]
-gtp_context_reg [fillcolor=moccasin]
-gtp_context_sup [fillcolor=azure]
-gtp_path [fillcolor=thistle]
-gtp_path_reg [fillcolor=yellow]
-gtp_path_sup [fillcolor=azure]
-gtp_proxy_ds [fillcolor=yellow]
-gtp_v1_c [fillcolor=lightpink]
-gtp_v1_u [fillcolor=lightpink]
-gtp_v2_c [fillcolor=lightpink]
-http_api_handler [fillcolor=khaki]
-itu_e212 [fillcolor=yellow]
-pgw_s5s8 [fillcolor=bisque]
-pgw_s5s8_proxy [fillcolor=bisque3]
-saegw_s11 [fillcolor=bisque]
-swagger_ui_handler [fillcolor=beige]
-tdf_sup [fillcolor=azure]
-tdf [fillcolor=lightsalmon]
-vrf [fillcolor=lightsalmon]
-/* behaviours */
-ergw_context [fillcolor=cyan2]
-gtp_api [fillcolor=cyan2]
-gtp_protocol [fillcolor=cyan2]
-regine_server [fillcolor=cyan3]
-application [fillcolor=cyan4]
-supervisor [fillcolor=cyan4]
-gen_server [fillcolor=cyan4]
-gen_statem [fillcolor=cyan4]
-/* ergw_aaa modules */
-ergw_aaa_diameter [fillcolor=darkslategray fontcolor=white]
-ergw_aaa_session [fillcolor=darkslategray fontcolor=white]
-ergw_aaa_session_sup [fillcolor=darkslategray fontcolor=white]
-/* gtplib */
-gtp_packet [fillcolor=midnightblue fontcolor=white]
-}
-/* No outgoing calls for 3gpp_qos */
-ergw -> {ergw_gtp_socket ergw_node_selection ergw_sx_node ergw_sx_node_mngr ergw_sx_node_reg ergw_gtp_socket_reg ergw_ip_pool gtp_path_reg gtp_context_reg}
-ergw -> gen_server [style="dashed" color="blue"]
-ergw_api -> {gtp_path_reg gtp_path gtp_context_reg gtp_context}
-ergw_app -> {ergw_prometheus ergw_sup ergw_config gtp_config}
-ergw_app -> application [style="dashed" color="blue"]
-/* No outgoing calls for ergw_cache */
-ergw_charging -> ergw_config
-ergw_config -> {ergw ergw_charging ergw_http_api ergw_gtp_socket ergw_ip_pool ergw_node_selection ergw_sx_socket gtp_c_lib gtp_proxy_ds vrf}
-ergw_context -> {gtp_context_reg gtp_context gtp_packet gtp_v1_c gtp_v2_c}
-/* No outgoing calls for ergw_control */
-ergw_gsn_lib -> {ergw_sx_node ergw_pfcp ergw_sx_socket ergw_inet ergw_ip_pool gtp_c_lib gtp_context_reg gtp_packet}
-ergw_gsn_lib -> {ergw_aaa_diameter ergw_aaa_session}
-ergw_gtp_c_socket -> {ergw_gtp_socket ergw_gtp_socket_reg ergw_cache ergw_prometheus ergw_context gtp_path gtp_packet gtp_config gtp_c_lib vrf}
-ergw_gtp_c_socket -> gen_server [style="dashed", color="blue"]
-ergw_gtp_socket -> {ergw_gtp_socket_sup ergw_gtp_u_socket ergw_gtp_c_socket ergw_config vrf}
-/* No outgoing calls for ergw_gtp_socket_reg */
-ergw_gtp_socket_reg -> regine_server [style="dashed" color="blue"]
-ergw_gtp_socket_sup -> supervisor [style="dashed" color="blue"]
-ergw_gtp_u_socket -> {ergw_gtp_socket ergw_gtp_socket_reg ergw_prometheus ergw_context gtp_config gtp_packet gtp_path vrf}
-ergw_gtp_u_socket -> gen_server [style="dashed" color="blue"]
-ergw_http_api -> ergw_config
-/* No outgoing calls for ergw_inet */
-ergw_ip_pool -> {ergw_ip_pool_sup ergw_ip_pool_reg ergw_config}
-ergw_ip_pool -> gen_server [style="dashed" color="blue"]
-/* No outgoing calls for ergw_ip_pool_reg */
-ergw_ip_pool_reg -> regine_server [style="dashed" color="blue"]
-ergw_ip_pool_sup -> supervisor [style="dashed" color="blue"]
-ergw_node_selection -> {ergw itu_e212}
-ergw_pfcp-> {ergw_inet ergw_gsn_lib gtp_context_reg}
-/* No outgoing calls for ergw_prometheus */
-ergw_proxy_lib -> {ergw_gtp_c_socket ergw_node_selection ergw_gtp_socket_reg ergw_config ergw_pfcp ergw_sx_node ergw_sx_socket gtp_context gtp_context_reg}
-ergw_sup -> supervisor [style="dashed" color="blue"]
-ergw_sx_node -> {ergw_node_selection ergw_sx_node_reg ergw_sx_socket ergw_gtp_u_socket ergw_pfcp ergw_gtp_socket ergw_inet ergw_sx_node_mngr gtp_context_reg gtp_packet gtp_context gtp_config vrf}
-ergw_sx_node -> {gen_statem, ergw_context} [style="dashed" color="blue"]
-ergw_sx_node_mngr -> {ergw_sx_node_reg ergw_sx_node ergw_sx_node_sup}
-ergw_sx_node_mngr -> gen_server [style="dashed" color="blue"]
-/* No outgoing calls for ergw_sx_node_reg */
-ergw_sx_node_reg -> regine_server [style="dashed" color="blue"]
-ergw_sx_node_sup -> supervisor [style="dashed" color="blue"]
-ergw_sx_socket -> {ergw_sup ergw_config ergw_gtp_socket_reg ergw_cache ergw_sx_node ergw_prometheus}
-ergw_sx_socket -> gen_server [style="dashed" color="blue"]
-ggsn_gn -> {"3gpp_qos" ergw ergw_gsn_lib ergw_charging ergw_node_selection ergw_inet ergw_sx_node gtp_context gtp_c_lib gtp_path gtp_v1_c gtp_packet itu_e212}
-ggsn_gn -> {ergw_aaa_session_sup ergw_aaa_session}
-ggsn_gn -> gtp_api [style="dashed" color="blue"]
-ggsn_gn_proxy -> {ergw_proxy_lib ergw_inet ergw_node_selection ergw_sx_node gtp_c_lib gtp_path gtp_context gtp_proxy_ds gtp_v1_c gtp_context_reg ggsn_gn}
-ggsn_gn_proxy -> {ergw_aaa_session_sup ergw_aaa_session}
-ggsn_gn_proxy -> gtp_api [style="dashed" color="blue"]
-/* No outgoing calls for gtp_api */
-gtp_api -> gen_statem [style="dashed" color="blue"]
-/* No outgoing calls for gtp_c_lib */
-/* No outgoing calls for gtp_config */
-gtp_context -> {ergw ergw_gtp_c_socket ergw_charging ergw_config ergw_pfcp ergw_gsn_lib gtp_context_reg gtp_context_sup gtp_v2_c gtp_v1_c gtp_packet gtp_c_lib gtp_path}
-gtp_context -> {gen_statem, ergw_context} [style="dashed" color="blue"]
-gtp_context_reg -> {ergw_pfcp gtp_context}
-gtp_context_reg -> gen_server [style="dashed" color="blue"]
-gtp_context_sup -> supervisor [style="dashed" color="blue"]
-gtp_path -> {ergw_gtp_c_socket ergw_prometheus gtp_path_sup gtp_path_reg gtp_packet gtp_context}
-gtp_path -> gen_server [style="dashed" color="blue"]
-/* No outgoing calls for gtp_path_reg */
-gtp_path_reg -> regine_server [style="dashed" color="blue"]
-gtp_path_sup -> supervisor [style="dashed" color="blue"]
-/* No outgoing calls for gtp_protocol */
-gtp_proxy_ds -> ergw_gsn_lib
-gtp_proxy_ds -> gen_server [style="dashed" color="blue"]
-gtp_v1_c -> ergw
-gtp_v1_c -> gtp_protocol [style="dashed" color="blue"]
-gtp_v1_u -> gtp_v1_c
-gtp_v1_u -> gtp_protocol [style="dashed" color="blue"]
-gtp_v2_c -> ergw
-gtp_v2_c -> gtp_protocol [style="dashed" color="blue"]
-http_api_handler -> {ergw ergw_api}
-/* No outgoing calls for itu_e212 */
-pgw_s5s8 -> {ergw ergw_gsn_lib ergw_node_selection ergw_charging ergw_inet ergw_sx_node gtp_context gtp_path gtp_v2_c gtp_c_lib itu_e212}
-pgw_s5s8 -> {ergw_aaa_session_sup ergw_aaa_session}
-pgw_s5s8 -> gtp_api [style="dashed" color="blue"]
-pgw_s5s8_proxy -> {ergw_proxy_lib ergw_inet ergw_gsn_lib ergw_node_selection ergw_sx_node gtp_c_lib gtp_path gtp_context gtp_proxy_ds gtp_v2_c gtp_context_reg pgw_s5s8}
-pgw_s5s8_proxy -> {ergw_aaa_session_sup ergw_aaa_session}
-pgw_s5s8_proxy -> gtp_api [style="dashed" color="blue"]
-saegw_s11 -> {ergw ergw_gsn_lib ergw_charging ergw_node_selection ergw_inet ergw_sx_node gtp_context gtp_c_lib gtp_path gtp_v2_c itu_e212}
-saegw_s11 -> {ergw_aaa_session_sup ergw_aaa_session}
-saegw_s11 -> gtp_api [style="dashed" color="blue"]
-/* No outgoing calls for swagger_ui_handler */
-tdf -> {ergw ergw_config ergw_gsn_lib ergw_charging ergw_pfcp ergw_inet ergw_sx_node gtp_context_reg tdf_sup}
-tdf -> {ergw_aaa_session_sup ergw_aaa_session}
-tdf -> {gen_statem, ergw_context} [style="dashed" color="blue"]
-tdf_sup -> supervisor [style="dashed" color="blue"]
-vrf -> ergw_config
-}
diff --git a/doc/dot_files/ergw_flow_syntax.svg b/doc/dot_files/ergw_flow_syntax.svg
deleted file mode 100644
index 5d5da97e..00000000
--- a/doc/dot_files/ergw_flow_syntax.svg
+++ /dev/null
@@ -1,1891 +0,0 @@
-
-
-
-
-
diff --git a/doc/dot_files/ergw_supervision_tree.dot b/doc/dot_files/ergw_supervision_tree.dot
deleted file mode 100644
index 54728314..00000000
--- a/doc/dot_files/ergw_supervision_tree.dot
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Version: 0.0.1, Date:2019-12-23, Status: Always Draft */
-/* ErGW supervision tree */
-/* Download graphwiz, and run dot cmd -> */
-/* 'dot -Tsvg ergw_supervision_tree.dot -o ergw_supervision_tree.svg' */
-digraph ergw_supervision_tree {
-{
-node [shape=oval style=filled]
-ergw_app [fillcolor=beige]
-ergw_sup [fillcolor=azure]
-ergw [fillcolor=greenyellow]
-ergw_sx_socket [fillcolor=bisque]
-ergw_gtp_c_socket [fillcolor=greenyellow]
-ergw_gtp_socket_reg [fillcolor=greenyellow]
-ergw_gtp_socket_sup [fillcolor=azure]
-ergw_gtp_socket [fillcolor=greenyellow]
-ergw_ip_pool_sup [fillcolor=azure]
-ergw_ip_pool_reg [fillcolor = greenyellow]
-ergw_ip_pool [fillcolor = greenyellow]
-ergw_sx_node_reg [fillcolor=greenyellow]
-ergw_sx_node_sup [fillcolor=azure]
-ergw_sx_node_mngr [fillcolor=greenyellow]
-ergw_sx_node [fillcolor=greenyellow]
-gtp_path_reg [fillcolor=greenyellow]
-gtp_path_sup [fillcolor=azure]
-gtp_path [fillcolor=greenyellow]
-gtp_context_reg [fillcolor=greenyellow]
-gtp_context_sup [fillcolor=azure]
-gtp_context [fillcolor=greenyellow]
-gtp_proxy_ds [fillcolor=greenyellow]
-tdf_sup [fillcolor=azure]
-tdf [fillcolor=greenyellow]
-}
-ergw_app -> ergw_sup
-ergw_sup -> {gtp_path_reg gtp_path_sup gtp_context_reg gtp_context_sup tdf_sup ergw_gtp_socket_reg ergw_gtp_socket_sup ergw_sx_node_reg ergw_sx_node_sup ergw_sx_node_mngr gtp_proxy_ds ergw_ip_pool_reg ergw_ip_pool_sup ergw}
-ergw_sup -> ergw_sx_socket
-ergw_gtp_socket_sup -> {ergw_gtp_socket ergw_gtp_c_socket}
-ergw_ip_pool_sup -> ergw_ip_pool
-ergw_sx_node_sup -> ergw_sx_node
-gtp_context_sup -> gtp_context
-gtp_path_sup -> gtp_path
-tdf_sup -> tdf
-}
diff --git a/doc/dot_files/ergw_supervision_tree.svg b/doc/dot_files/ergw_supervision_tree.svg
deleted file mode 100644
index 10e2462c..00000000
--- a/doc/dot_files/ergw_supervision_tree.svg
+++ /dev/null
@@ -1,295 +0,0 @@
-
-
-
-
-
diff --git a/doc/dot_files/ggsn_gn.dot b/doc/dot_files/ggsn_gn.dot
deleted file mode 100644
index a8738221..00000000
--- a/doc/dot_files/ggsn_gn.dot
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Version: 0.0.1, Date:2019-12-23, Status: Always Draft */
-/* Diagram of ggsn_gn.erl connections */
-/* Download graphwiz & run in dot file directory the cmd (without quotes)-> */
-/* 'dot -Tsvg ggsn_gn.dot -o ggsn_gn.svg' */
-digraph ggsn_gn {
-ratio="fill"
-/* size="8,2\!" */
-{
-node [shape=oval style=filled]
-"3gpp_qos"[fillcolor=violet]
-ergw [fillcolor=cornsilk]
-ergw_charging [fillcolor=lightcyan]
-ergw_config [fillcolor=lightcyan]
-ergw_gsn_lib [fillcolor=cornsilk]
-ergw_gtp_c_socket [fillcolor=lightcyan]
-ergw_inet [fillcolor=cornsilk]
-ergw_node_selection [fillcolor=cornsilk]
-ergw_pfcp [fillcolor=lightcyan]
-ergw_sx_node [fillcolor=lightcyan]
-ergw_sx_node_reg [fillcolor=lightcyan]
-ggsn_gn [fillcolor=rosybrown]
-gtp_api [fillcolor=lightsalmon]
-gtp_c_lib [fillcolor=burlywood1]
-gtp_context [fillcolor=burlywood1]
-gtp_context_reg [fillcolor=lightcyan]
-gtp_packet [fillcolor=burlywood1]
-gtp_path [fillcolor=burlywood1]
-gtp_v1_c [fillcolor=burlywood1]
-itu_e212 [fillcolor=lightpink]
-ergw_aaa_session_sup [fillcolor=beige]
-ergw_aaa_session [fillcolor=bisque]
-ergw_aaa_diameter [fillcolor=bisque]
-}
-edge [color=black style=dotted]
-ergw_charging -> {ergw_config}
-ergw_gsn_lib -> {ergw_sx_node ergw_pfcp}
-ergw_gsn_lib -> {ergw_aaa_diameter ergw_aaa_session}
-ergw_sx_node -> {ergw_sx_node_reg ergw_node_selection}
-gtp_context -> {ergw_charging ergw_config ergw_gtp_c_socket gtp_context_reg gtp_path}
-edge [color=crimson style=solid]
-ggsn_gn -> {"3gpp_qos" ergw ergw_gsn_lib ergw_charging ergw_node_selection ergw_inet ergw_sx_node gtp_context gtp_c_lib gtp_path gtp_v1_c gtp_packet itu_e212}
-edge [color=darkolivegreen]
-ggsn_gn -> {ergw_aaa_session_sup ergw_aaa_session}
-edge [color=blue]
-ggsn_gn -> gtp_api [style="dashed" color="blue"]
-}
diff --git a/doc/dot_files/ggsn_gn.svg b/doc/dot_files/ggsn_gn.svg
deleted file mode 100644
index a2923aaa..00000000
--- a/doc/dot_files/ggsn_gn.svg
+++ /dev/null
@@ -1,319 +0,0 @@
-
-
-
-
-
diff --git a/doc/dot_files/pgw_s5s8.dot b/doc/dot_files/pgw_s5s8.dot
deleted file mode 100644
index eeefe091..00000000
--- a/doc/dot_files/pgw_s5s8.dot
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Version: 0.0.1, Date:2019-12-23, Status: Always Draft */
-/* Diagram of pgw_s5s8 connections */
-/* Download graphwiz & run in dot file directory the cmd (without quotes)-> */
-/* 'dot -Tsvg pgw_s5s8.dot -o pgw_s5s8.svg' */
-digraph pgw_s5s8 {
-ratio="fill"
-/* size="8,2\!" */
-{
-node [shape=oval style=filled]
-ergw [fillcolor=cornsilk]
-ergw_charging [fillcolor=lightcyan]
-ergw_config [fillcolor=lightcyan]
-ergw_gsn_lib [fillcolor=cornsilk]
-ergw_gtp_c_socket [fillcolor=lightcyan]
-ergw_inet [fillcolor=cornsilk]
-ergw_node_selection [fillcolor=cornsilk]
-ergw_pfcp [fillcolor=lightcyan]
-ergw_sx_node [fillcolor=lightcyan]
-ergw_sx_node_reg [fillcolor=lightcyan]
-gtp_api [fillcolor=lightsalmon]
-gtp_c_lib [fillcolor=burlywood1]
-gtp_context [fillcolor=burlywood1]
-gtp_context_reg [fillcolor=lightcyan]
-gtp_path [fillcolor=burlywood1]
-gtp_v2_c [fillcolor=burlywood1]
-itu_e212 [fillcolor=lightpink]
-pgw_s5s8 [fillcolor=tomato]
-ergw_aaa_session_sup [fillcolor=beige]
-ergw_aaa_session [fillcolor=bisque]
-ergw_aaa_diameter [fillcolor=bisque]
-}
-edge [color=black style=dotted]
-ergw_charging -> ergw_config
-ergw_gsn_lib -> {ergw_sx_node ergw_pfcp}
-ergw_gsn_lib -> {ergw_aaa_diameter ergw_aaa_session}
-ergw_sx_node -> {ergw_sx_node_reg ergw_node_selection}
-gtp_context -> {ergw_charging ergw_config ergw_gtp_c_socket gtp_context_reg gtp_path}
-edge [color=crimson style=solid]
-pgw_s5s8 -> {ergw ergw_gsn_lib ergw_node_selection ergw_charging ergw_inet ergw_sx_node gtp_context gtp_path gtp_v2_c gtp_c_lib itu_e212}
-edge [color=darkolivegreen]
-pgw_s5s8 -> {ergw_aaa_session_sup ergw_aaa_session}
-edge [color=blue]
-pgw_s5s8 -> gtp_api [style="dashed" color="blue"]
-}
diff --git a/doc/dot_files/pgw_s5s8.svg b/doc/dot_files/pgw_s5s8.svg
deleted file mode 100644
index 5134c0bd..00000000
--- a/doc/dot_files/pgw_s5s8.svg
+++ /dev/null
@@ -1,295 +0,0 @@
-
-
-
-
-