diff --git a/assets/cfg-arc-renderer.html b/assets/cfg-arc-renderer.html
index 25f245546..35696008a 100644
--- a/assets/cfg-arc-renderer.html
+++ b/assets/cfg-arc-renderer.html
@@ -1,3 +1,16 @@
+<!-- ----------------------------------------------------------------------- -->
+<!--                                                                         -->
+<!--                        SuperBOL OSS Studio                              -->
+<!--                                                                         -->
+<!--                                                                         -->
+<!--  Copyright (c) 2024 OCamlPro SAS                                        -->
+<!--                                                                         -->
+<!--  All rights reserved.                                                   -->
+<!--  This source code is licensed under the MIT license found in the        -->
+<!--  LICENSE.md file in the root directory of this source tree.             -->
+<!--                                                                         -->
+<!-- ----------------------------------------------------------------------- -->
+
 <!-- Base html file used to render arc cfg variant -->
 <!DOCTYPE html>
 <head>
diff --git a/assets/cfg-arc.css b/assets/cfg-arc.css
index 989550595..e272a31e2 100644
--- a/assets/cfg-arc.css
+++ b/assets/cfg-arc.css
@@ -1,3 +1,17 @@
+/* -----------------------------------------------------------------------
+ *
+ *                        SuperBOL OSS Studio
+ *
+ *
+ *  Copyright (c) 2024 OCamlPro SAS
+ *
+ *  All rights reserved.
+ *  This source code is licensed under the MIT license found in the
+ *  LICENSE.md file in the root directory of this source tree.
+ *
+ * -----------------------------------------------------------------------
+ */
+
 html, body {
   height: 100%;
 }
diff --git a/assets/cfg-arc.js b/assets/cfg-arc.js
index 4c0d78d66..51e2b8377 100644
--- a/assets/cfg-arc.js
+++ b/assets/cfg-arc.js
@@ -1,3 +1,16 @@
+// -----------------------------------------------------------------------
+//
+//                        SuperBOL OSS Studio
+//
+//
+//  Copyright (c) 2024 OCamlPro SAS
+//
+//  All rights reserved.
+//  This source code is licensed under the MIT license found in the
+//  LICENSE.md file in the root directory of this source tree.
+//
+// -----------------------------------------------------------------------
+//
 // JS file attached to cfg-arc-renderer.html
 
 const vscode = acquireVsCodeApi()
diff --git a/assets/cfg-dot-renderer.html b/assets/cfg-dot-renderer.html
index 2bf7acbf3..6f8da98c3 100644
--- a/assets/cfg-dot-renderer.html
+++ b/assets/cfg-dot-renderer.html
@@ -1,3 +1,16 @@
+<!-- ----------------------------------------------------------------------- -->
+<!--                                                                         -->
+<!--                        SuperBOL OSS Studio                              -->
+<!--                                                                         -->
+<!--                                                                         -->
+<!--  Copyright (c) 2024 OCamlPro SAS                                        -->
+<!--                                                                         -->
+<!--  All rights reserved.                                                   -->
+<!--  This source code is licensed under the MIT license found in the        -->
+<!--  LICENSE.md file in the root directory of this source tree.             -->
+<!--                                                                         -->
+<!-- ----------------------------------------------------------------------- -->
+
 <!-- Credit @beicause in https://github.com/beicause/call-graph/blob/master/src/html.ts -->
 <!-- Base html file for rendering graphviz cfg variant -->
 <!DOCTYPE html>
@@ -31,8 +44,8 @@ <h2 id="title">Title</h2>
         <label for="unreachable">Remove unreachable nodes</label></div>
       <div><input type="checkbox" id="fallthru" />
         <label for="fallthru">Collapse fallthrough transitions</label></div>
-      <div><input type="checkbox" id="hubshatter"/>
-        <label for="hubshatter">Split nodes with more than
+      <div><input type="checkbox" id="in_degree_upper_limit"/>
+        <label for="in_degree_upper_limit">Split nodes with more than
           <input type="number" id="hubcount" value="20" /> incoming edges</label>
       </div>
       <hr/>
diff --git a/assets/cfg-dot.css b/assets/cfg-dot.css
index dd83f4e7e..076df7a4b 100644
--- a/assets/cfg-dot.css
+++ b/assets/cfg-dot.css
@@ -1,3 +1,17 @@
+/* -----------------------------------------------------------------------
+ *
+ *                        SuperBOL OSS Studio
+ *
+ *
+ *  Copyright (c) 2024 OCamlPro SAS
+ *
+ *  All rights reserved.
+ *  This source code is licensed under the MIT license found in the
+ *  LICENSE.md file in the root directory of this source tree.
+ *
+ * -----------------------------------------------------------------------
+ */
+
 html, body {
   height: 100%;
 }
diff --git a/assets/cfg-dot.js b/assets/cfg-dot.js
index f61ef22cb..93d63e8c9 100644
--- a/assets/cfg-dot.js
+++ b/assets/cfg-dot.js
@@ -1,3 +1,16 @@
+// -----------------------------------------------------------------------
+//
+//                        SuperBOL OSS Studio
+//
+//
+//  Copyright (c) 2024 OCamlPro SAS
+//
+//  All rights reserved.
+//  This source code is licensed under the MIT license found in the
+//  LICENSE.md file in the root directory of this source tree.
+//
+// -----------------------------------------------------------------------
+//
 // JS file attached to cfg-dot-renderer.html
 
 const legend = `digraph legend {
@@ -39,7 +52,7 @@ const defaultOptions = {
   split_nodes: [],
   hide_unreachable: false,
   collapse_fallthru: false,
-  shatter_hubs: undefined,
+  in_degree_upper_limit: undefined,
 }
 var renderOptions = defaultOptions;
 var rendering = d3.select('#rendering')
@@ -112,12 +125,12 @@ function setRenderOptions(renderOptions_) {
     renderOptions.hide_unreachable;
   document.getElementById("fallthru").checked =
     renderOptions.collapse_fallthru;
-  document.getElementById("hubshatter").checked =
-    renderOptions.shatter_hubs != undefined;
+  document.getElementById("in_degree_upper_limit").checked =
+    renderOptions.in_degree_upper_limit != undefined;
   document.getElementById("hubcount").value =
-    renderOptions.shatter_hubs == undefined
+    renderOptions.in_degree_upper_limit == undefined
     ? "20"
-    : String(renderOptions.shatter_hubs);
+    : String(renderOptions.in_degree_upper_limit);
   const nodeElements = document.querySelectorAll(".nodes-list > p");
   for (let p of nodeElements) {
     p.remove();
@@ -137,17 +150,17 @@ function setRenderOptions(renderOptions_) {
 function rerender() {
   var collapse_fallthru = document.getElementById('fallthru').checked;
   var hide_unreachable = document.getElementById('unreachable').checked;
-  if(document.getElementById('hubshatter').checked) {
-    var shatter_hubs = Number(document.getElementById('hubcount').value)
+  if(document.getElementById('in_degree_upper_limit').checked) {
+    var in_degree_upper_limit = Number(document.getElementById('hubcount').value)
   }
   else {
-    var shatter_hubs = undefined;
+    var in_degree_upper_limit = undefined;
   }
   renderOptions = {
     ...renderOptions,
     hide_unreachable,
     collapse_fallthru,
-    shatter_hubs,
+    in_degree_upper_limit,
   };
   vscode.postMessage({ type: 'graph_update', renderOptions })
 }
diff --git a/src/lsp/cobol_cfg/cfg_builder.ml b/src/lsp/cobol_cfg/cfg_builder.ml
index 67550e47d..178393154 100644
--- a/src/lsp/cobol_cfg/cfg_builder.ml
+++ b/src/lsp/cobol_cfg/cfg_builder.ml
@@ -13,6 +13,7 @@ open Cobol_common.Srcloc.INFIX
 open Cobol_common.Srcloc.TYPES
 open Cobol_unit.Types
 open Cfg_jumps
+open Cfg_types
 module NEL = Cobol_common.Basics.NEL
 
 (* TYPES AND HELPERS *)
@@ -55,48 +56,11 @@ let entry_stmt_to_string_loc = function
 
 (* CFG MODULE *)
 
-type node_type =
-  | External of string
-  | Entry of [`Point | `Paragraph | `Section of string | `Statement of string]
-  | Normal of string * string (* fullname * display_name *)
-  | Collapsed of string NEL.t
-  | Split of string
-
-type node = {
-  id: int;
-  section_name: string;
-  loc: srcloc option;
-  typ: node_type;
-  jumps: Jumps.t;
-  will_fallthru: bool;
-  terminal: bool; (* unused atm *)
-}
-
 let is_entry n =
   match n.typ with
   | External _ | Normal _ | Collapsed _ | Split _ -> false
   | Entry _ -> true
 
-type edge =
-  | FallThrough
-  | Perform
-  | Go
-
-module Node = struct
-  type t = node
-  let compare node other = Int.compare node.id other.id
-  let hash node = Hashtbl.hash node.id
-  let equal node other = Int.equal node.id other.id
-end
-
-module Edge = struct
-  type t = edge
-  let compare = Stdlib.compare
-  let default = FallThrough
-end
-
-module Cfg = Graph.Persistent.Digraph.ConcreteLabeled(Node)(Edge)
-
 (* DEFAULT CFG BUILDER FUNCTION *)
 
 let node_idx = ref 0
@@ -346,8 +310,8 @@ let do_hide_unreachable g =
 let clone_node node =
   { node with id = next_node_idx (); }
 
-let do_shatter_nodes ~ids ~limit g =
-  let shatter_typ { typ; _ } =
+let do_split_nodes ~ids ~limit g =
+  let split_typ { typ; _ } =
     match typ with
     | External name -> Some (External name, true)
     | Normal (_, name) -> Some (Split name, false)
@@ -359,7 +323,7 @@ let do_shatter_nodes ~ids ~limit g =
     | None -> false
   in
   Cfg.fold_vertex begin fun n cfg ->
-    match shatter_typ n with
+    match split_typ n with
     | Some (typ, remove_original)
       when is_above_limit n || List.mem n.id ids ->
       let cfg = Cfg.fold_pred_e begin fun edge cfg ->
@@ -447,7 +411,9 @@ let handle_cfg_options ~(options: Cfg_options.t) cfg =
   |> (match options.hidden_nodes with
       | [] -> Fun.id
       | l -> remove_nodes l)
-  |> do_shatter_nodes ~ids:options.split_nodes ~limit:options.shatter_hubs
+  |> do_split_nodes
+    ~ids:options.split_nodes
+    ~limit:options.in_degree_upper_limit
   |> (if options.collapse_fallthru then do_collapse_fallthru else Fun.id)
 
 (* GRAPH OUTPUT FORMAT *)
diff --git a/src/lsp/cobol_cfg/cfg_builder.mli b/src/lsp/cobol_cfg/cfg_builder.mli
index febbd0e3b..817f9c84c 100644
--- a/src/lsp/cobol_cfg/cfg_builder.mli
+++ b/src/lsp/cobol_cfg/cfg_builder.mli
@@ -8,135 +8,7 @@
 (*                                                                            *)
 (******************************************************************************)
 
-open Cfg_jumps
-
-type node_type =
-  | External of string
-  | Entry of [`Point | `Paragraph | `Section of string | `Statement of string]
-  | Normal of string * string (* fullname * display_name *)
-  | Collapsed of string Cobol_common.Basics.NEL.t
-  | Split of string
-
-type node = {
-  id: int;
-  section_name: string;
-  loc: Cobol_common.srcloc option;
-  typ: node_type;
-  jumps: Jumps.t;
-  will_fallthru: bool;
-  terminal: bool; (* unused atm *)
-}
-
-module Node: sig
-  type t = node
-
-  val compare : node -> node -> int
-  val hash : node -> int
-  val equal : node -> node -> bool
-end
-
-type edge =
-  | FallThrough
-  | Perform
-  | Go
-
-module Edge: sig
-  type t = edge
-
-  val compare : 'a -> 'a -> int
-  val default : edge
-end
-
-module Cfg :
-sig
-  type t
-
-  module V : sig
-    type t = node
-
-    val compare : t -> t -> int
-    val hash : t -> int
-    val equal : t -> t -> bool
-
-    type label = t
-
-    val create : label -> t
-    val label : t -> label
-  end
-
-  type vertex = node
-
-  module E : sig
-    type t = vertex * edge * vertex
-
-    val compare : t -> t -> int
-
-    type vertex = node
-
-    val src : t -> vertex
-    val dst : t -> vertex
-
-    type label = edge
-
-    val create : vertex -> label -> vertex -> t
-    val label : t -> label
-  end
-
-  type edge = E.t
-
-  val is_directed : bool
-  val is_empty : t -> bool
-  val nb_vertex : t -> int
-  val nb_edges : t -> int
-  val out_degree : t -> vertex -> int
-  val in_degree : t -> vertex -> int
-  val mem_vertex : t -> vertex -> bool
-  val mem_edge : t -> vertex -> vertex -> bool
-  val mem_edge_e : t -> edge -> bool
-  val find_edge : t -> vertex -> vertex -> edge
-  val find_all_edges : t -> vertex -> vertex -> edge list
-  val succ : t -> vertex -> vertex list
-  val pred : t -> vertex -> vertex list
-  val succ_e : t -> vertex -> edge list
-  val pred_e : t -> vertex -> edge list
-  val iter_vertex : (vertex -> unit) -> t -> unit
-  val fold_vertex : (vertex -> 'a -> 'a) -> t -> 'a -> 'a
-  val iter_edges : (vertex -> vertex -> unit) -> t -> unit
-
-  val fold_edges :
-    (vertex -> vertex -> 'a -> 'a) -> t -> 'a -> 'a
-
-  val iter_edges_e : (edge -> unit) -> t -> unit
-  val fold_edges_e : (edge -> 'a -> 'a) -> t -> 'a -> 'a
-  val map_vertex : (vertex -> vertex) -> t -> t
-  val iter_succ : (vertex -> unit) -> t -> vertex -> unit
-  val iter_pred : (vertex -> unit) -> t -> vertex -> unit
-
-  val fold_succ :
-    (vertex -> 'a -> 'a) -> t -> vertex -> 'a -> 'a
-
-  val fold_pred :
-    (vertex -> 'a -> 'a) -> t -> vertex -> 'a -> 'a
-
-  val iter_succ_e : (edge -> unit) -> t -> vertex -> unit
-
-  val fold_succ_e :
-    (edge -> 'a -> 'a) -> t -> vertex -> 'a -> 'a
-
-  val iter_pred_e : (edge -> unit) -> t -> vertex -> unit
-
-  val fold_pred_e :
-    (edge -> 'a -> 'a) -> t -> vertex -> 'a -> 'a
-
-  val empty : t
-  val add_vertex : t -> vertex -> t
-  val remove_vertex : t -> vertex -> t
-  val add_edge : t -> vertex -> vertex -> t
-  val add_edge_e : t -> edge -> t
-  val remove_edge : t -> vertex -> vertex -> t
-  val remove_edge_e : t -> edge -> t
-end
-
+open Cfg_types
 
 val make
   : options:Cfg_options.t
diff --git a/src/lsp/cobol_cfg/cfg_options.ml b/src/lsp/cobol_cfg/cfg_options.ml
index ce03e0885..8ca22db3d 100644
--- a/src/lsp/cobol_cfg/cfg_options.ml
+++ b/src/lsp/cobol_cfg/cfg_options.ml
@@ -15,9 +15,9 @@ type transformation =
 type t = {
   hide_unreachable: bool;
   collapse_fallthru: bool;
-  shatter_hubs: int option;
+  in_degree_upper_limit: int option;
   transformation: transformation option;
-  hidden_nodes: int list;
-  split_nodes: int list;
+  hidden_nodes: int list; (* id list *)
+  split_nodes: int list;  (* id list *)
 }
 
diff --git a/src/lsp/cobol_cfg/cfg_types.ml b/src/lsp/cobol_cfg/cfg_types.ml
new file mode 100644
index 000000000..3f7e69982
--- /dev/null
+++ b/src/lsp/cobol_cfg/cfg_types.ml
@@ -0,0 +1,50 @@
+(******************************************************************************)
+(*                                                                            *)
+(*     Copyright (c) 2021-2023 OCamlPro SAS                                   *)
+(*                                                                            *)
+(*     All rights reserved.                                                   *)
+(*     This file is distributed under the terms of the                        *)
+(*     OCAMLPRO-NON-COMMERCIAL license.                                       *)
+(*                                                                            *)
+(******************************************************************************)
+
+open Cobol_common.Srcloc.TYPES
+open Cfg_jumps
+module NEL = Cobol_common.Basics.NEL
+
+type node_type =
+  | External of string
+  | Entry of [`Point | `Paragraph | `Section of string | `Statement of string]
+  | Normal of string * string (* fullname * display_name *)
+  | Collapsed of string NEL.t
+  | Split of string
+
+type node = {
+  id: int;
+  section_name: string;
+  loc: srcloc option;
+  typ: node_type;
+  jumps: Jumps.t;
+  will_fallthru: bool;
+  terminal: bool; (* unused atm *)
+}
+
+type edge =
+  | FallThrough
+  | Perform
+  | Go
+
+module Node = struct
+  type t = node
+  let compare node other = Int.compare node.id other.id
+  let hash node = Hashtbl.hash node.id
+  let equal node other = Int.equal node.id other.id
+end
+
+module Edge = struct
+  type t = edge
+  let compare = Stdlib.compare
+  let default = FallThrough
+end
+
+module Cfg = Graph.Persistent.Digraph.ConcreteLabeled(Node)(Edge)
diff --git a/src/lsp/cobol_cfg/cobol_cfg.ml b/src/lsp/cobol_cfg/cobol_cfg.ml
index 4bd095ca2..14d741ad9 100644
--- a/src/lsp/cobol_cfg/cobol_cfg.ml
+++ b/src/lsp/cobol_cfg/cobol_cfg.ml
@@ -8,5 +8,6 @@
 (*                                                                            *)
 (******************************************************************************)
 
+module Types = Cfg_types
 module Options = Cfg_options
 module Builder = Cfg_builder
diff --git a/src/lsp/cobol_lsp/lsp_cfg.ml b/src/lsp/cobol_lsp/lsp_cfg.ml
index c3e47410f..7bbb595f7 100644
--- a/src/lsp/cobol_lsp/lsp_cfg.ml
+++ b/src/lsp/cobol_lsp/lsp_cfg.ml
@@ -1,5 +1,6 @@
 (* what licence here ? *)
 
+open Cobol_cfg.Types
 open Cobol_cfg.Builder
 
 let create_cfg_options o =
@@ -14,8 +15,8 @@ let create_cfg_options o =
       List.assoc "collapse_fallthru" o |> to_bool
     with Not_found -> false
   in
-  let shatter_hubs =
-    List.assoc_opt "shatter_hubs" o |> Option.map to_int in
+  let in_degree_upper_limit =
+    List.assoc_opt "in_degree_upper_limit" o |> Option.map to_int in
   let transformation =
     let id =
       List.assoc_opt "id" o |> Option.map to_int in
@@ -40,7 +41,7 @@ let create_cfg_options o =
   ({
     hide_unreachable;
     collapse_fallthru;
-    shatter_hubs;
+    in_degree_upper_limit;
     transformation;
     hidden_nodes;
     split_nodes;
@@ -52,7 +53,7 @@ let vertex_name_record names =
     names
 
 module Dot = Graph.Graphviz.Dot(struct
-    include Cobol_cfg.Builder.Cfg
+    include Cobol_cfg.Types.Cfg
     let edge_attributes (_,s,_) =
       [`Style (match s with
            | FallThrough -> `Dotted
