diff --git a/cfg/active-pid-and-tasks.cfg b/cfg/active-pid-and-tasks.cfg
deleted file mode 100644
index d10f56a..0000000
--- a/cfg/active-pid-and-tasks.cfg
+++ /dev/null
@@ -1,122 +0,0 @@
-#ParaverCFG
-ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 3
-
-
-################################################################################
-< NEW DISPLAYING WINDOW Active PID >
-################################################################################
-window_name Active PID
-window_type single
-window_id 1
-window_position_x 960
-window_position_y 24
-window_width 954
-window_height 323
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Milliseconds
-window_maximum_y 287531.000000000000
-window_minimum_y 287530.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 1
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Active Task ID >
-################################################################################
-window_name Active Task ID
-window_type single
-window_id 2
-window_position_x 960
-window_position_y 374
-window_width 954
-window_height 324
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Milliseconds
-window_maximum_y 21.000000000000
-window_minimum_y 2.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 10
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Active Task Type ID >
-################################################################################
-window_name Active Task Type ID
-window_type single
-window_id 3
-window_position_x 960
-window_position_y 725
-window_width 954
-window_height 324
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Milliseconds
-window_maximum_y 21.000000000000
-window_minimum_y 2.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 11
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
diff --git a/cfg/all.cfg b/cfg/all.cfg
deleted file mode 100644
index 601a846..0000000
--- a/cfg/all.cfg
+++ /dev/null
@@ -1,283 +0,0 @@
-#ParaverCFG
-ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 7
-
-
-################################################################################
-< NEW DISPLAYING WINDOW Active PID >
-################################################################################
-window_name Active PID
-window_type single
-window_id 1
-window_position_x 0
-window_position_y 231
-window_width 956
-window_height 189
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 7088.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_object task { 0, 1, { All } }
-window_object thread { 0, 0, 19, { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 1
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Active Task ID >
-################################################################################
-window_name Active Task ID
-window_type single
-window_id 2
-window_position_x 0
-window_position_y 442
-window_width 956
-window_height 190
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 21.000000000000
-window_minimum_y 2.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_object task { 0, 1, { All } }
-window_object thread { 0, 0, 19, { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 10
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Active Task Type ID >
-################################################################################
-window_name Active Task Type ID
-window_type single
-window_id 3
-window_position_x 0
-window_position_y 654
-window_width 956
-window_height 190
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 21.000000000000
-window_minimum_y 2.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_object task { 0, 1, { All } }
-window_object thread { 0, 0, 19, { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 11
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Number of threads running per CPU >
-################################################################################
-window_name Number of threads running per CPU
-window_type single
-window_id 4
-window_position_x 0
-window_position_y 866
-window_width 956
-window_height 190
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 5.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_object task { 0, 1, { All } }
-window_object thread { 0, 0, 19, { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 3
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW T:Thread State >
-################################################################################
-window_name T:Thread State
-window_type single
-window_id 5
-window_position_x 960
-window_position_y 559
-window_width 956
-window_height 497
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 5.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 4
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW T:Active TID >
-################################################################################
-window_name T:Active TID
-window_type single
-window_id 6
-window_position_x 960
-window_position_y 40
-window_width 956
-window_height 497
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 7103.000000000000
-window_minimum_y 7086.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 2
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW C:Thread TID >
-################################################################################
-window_name C:Thread TID
-window_type single
-window_id 7
-window_position_x 0
-window_position_y 20
-window_width 956
-window_height 189
-window_comm_lines_enabled true
-window_flags_enabled true
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 7102.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_object task { 0, 1, { All } }
-window_object thread { 0, 0, 19, { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 2
-window_filter_module evt_type_label 1 "Unknown"
-window_synchronize 1
-
diff --git a/cfg/cpu.cfg b/cfg/cpu.cfg
deleted file mode 100644
index 45e6360..0000000
--- a/cfg/cpu.cfg
+++ /dev/null
@@ -1,273 +0,0 @@
-#ParaverCFG
-ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 7
-
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: PID of the RUNNING thread >
-################################################################################
-window_name CPU: PID of the RUNNING thread
-window_type single
-window_id 1
-window_position_x 0
-window_position_y 476
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 113346.000000000000
-window_minimum_y 777.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 1
-window_filter_module evt_type_label 1 "CPU: PID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: nOS-V TaskID of the RUNNING thread >
-################################################################################
-window_name CPU: nOS-V TaskID of the RUNNING thread
-window_type single
-window_id 2
-window_position_x 0
-window_position_y 626
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 2000.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 8
-window_filter_module evt_type_label 1 "CPU: nOS-V TaskID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: nOS-V task type of the RUNNING thread >
-################################################################################
-window_name CPU: nOS-V task type of the RUNNING thread
-window_type single
-window_id 3
-window_position_x 0
-window_position_y 24
-window_width 954
-window_height 124
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 777.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 11
-window_filter_module evt_type_label 1 "CPU: nOS-V task type of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: Number of RUNNING threads >
-################################################################################
-window_name CPU: Number of RUNNING threads
-window_type single
-window_id 4
-window_position_x 0
-window_position_y 175
-window_width 954
-window_height 124
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 65.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_random
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 3
-window_filter_module evt_type_label 1 "CPU: Number of RUNNING threads"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: TID of the RUNNING thread >
-################################################################################
-window_name CPU: TID of the RUNNING thread
-window_type single
-window_id 5
-window_position_x 0
-window_position_y 326
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 114243.000000000000
-window_minimum_y 777.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 2
-window_filter_module evt_type_label 1 "CPU: TID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: nOS-V task AppID of the RUNNING thread >
-################################################################################
-window_name CPU: nOS-V task AppID of the RUNNING thread
-window_type single
-window_id 6
-window_position_x 0
-window_position_y 776
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 777.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 12
-window_filter_module evt_type_label 1 "CPU: nOS-V task AppID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: nOS-V subsystem of the RUNNING thread >
-################################################################################
-window_name CPU: nOS-V subsystem of the RUNNING thread
-window_type single
-window_id 7
-window_position_x 0
-window_position_y 926
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 777.000000000000
-window_minimum_y 6.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 13
-window_filter_module evt_type_label 1 "CPU: nOS-V subsystem of the RUNNING thread"
-window_synchronize 1
-
diff --git a/cfg/cpu-kernel-context-switch.cfg b/cfg/cpu/kernel/context-switch.cfg
similarity index 100%
rename from cfg/cpu-kernel-context-switch.cfg
rename to cfg/cpu/kernel/context-switch.cfg
diff --git a/cfg/cpu/nanos6/mpi-rank.cfg b/cfg/cpu/nanos6/mpi-rank.cfg
index 1ee9333..88ba624 100644
--- a/cfg/cpu/nanos6/mpi-rank.cfg
+++ b/cfg/cpu/nanos6/mpi-rank.cfg
@@ -37,7 +37,7 @@ window_pixel_size 1
 window_labels_to_draw 1
 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
 window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 39
+window_filter_module evt_type 1 38
 window_filter_module evt_type_label 1 "CPU: Nanos6 thread type of the running thread"
 window_synchronize 1
 
diff --git a/cfg/cpu/nanos6/task-types.cfg b/cfg/cpu/nanos6/task-type.cfg
similarity index 100%
rename from cfg/cpu/nanos6/task-types.cfg
rename to cfg/cpu/nanos6/task-type.cfg
diff --git a/cfg/cpu-nodes-subsystem.cfg b/cfg/cpu/nodes/subsystem.cfg
similarity index 100%
rename from cfg/cpu-nodes-subsystem.cfg
rename to cfg/cpu/nodes/subsystem.cfg
diff --git a/cfg/cpu/nosv/subsystem.cfg b/cfg/cpu/nosv/subsystem.cfg
new file mode 100644
index 0000000..c771d0b
--- /dev/null
+++ b/cfg/cpu/nosv/subsystem.cfg
@@ -0,0 +1,43 @@
+#ParaverCFG
+ConfigFile.Version: 3.4
+ConfigFile.NumWindows: 7
+
+
+################################################################################
+< NEW DISPLAYING WINDOW CPU: nOS-V subsystem of the RUNNING thread >
+################################################################################
+window_name CPU: nOS-V subsystem of the RUNNING thread
+window_type single
+window_id 7
+window_position_x 0
+window_position_y 926
+window_width 954
+window_height 123
+window_comm_lines_enabled true
+window_flags_enabled false
+window_noncolor_mode true
+window_logical_filtered true
+window_physical_filtered false
+window_comm_fromto true
+window_comm_tagsize true
+window_comm_typeval true
+window_units Microseconds
+window_maximum_y 777.000000000000
+window_minimum_y 6.000000000000
+window_compute_y_max false
+window_level thread
+window_scale_relative 1.000000000000
+window_end_time_relative 1.000000000000
+window_object appl { 1, { All } }
+window_begin_time_relative 0.000000000000
+window_open true
+window_drawmode draw_randnotzero
+window_drawmode_rows draw_randnotzero
+window_pixel_size 1
+window_labels_to_draw 1
+window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
+window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
+window_filter_module evt_type 1 13
+window_filter_module evt_type_label 1 "CPU: nOS-V subsystem of the RUNNING thread"
+window_synchronize 1
+
diff --git a/cfg/cpu/nosv/task-appid.cfg b/cfg/cpu/nosv/task-appid.cfg
new file mode 100644
index 0000000..6b93f50
--- /dev/null
+++ b/cfg/cpu/nosv/task-appid.cfg
@@ -0,0 +1,43 @@
+#ParaverCFG
+ConfigFile.Version: 3.4
+ConfigFile.NumWindows: 7
+
+
+################################################################################
+< NEW DISPLAYING WINDOW CPU: nOS-V task AppID of the RUNNING thread >
+################################################################################
+window_name CPU: nOS-V task AppID of the RUNNING thread
+window_type single
+window_id 6
+window_position_x 0
+window_position_y 776
+window_width 954
+window_height 123
+window_comm_lines_enabled true
+window_flags_enabled false
+window_noncolor_mode true
+window_color_mode window_in_null_gradient_mode
+window_logical_filtered true
+window_physical_filtered false
+window_comm_fromto true
+window_comm_tagsize true
+window_comm_typeval true
+window_units Microseconds
+window_maximum_y 777.000000000000
+window_minimum_y 1.000000000000
+window_compute_y_max false
+window_level thread
+window_scale_relative 1.000000000000
+window_end_time_relative 1.000000000000
+window_object appl { 1, { All } }
+window_begin_time_relative 0.000000000000
+window_open true
+window_drawmode draw_randnotzero
+window_drawmode_rows draw_randnotzero
+window_pixel_size 1
+window_labels_to_draw 1
+window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
+window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
+window_filter_module evt_type 1 12
+window_filter_module evt_type_label 1 "CPU: nOS-V task AppID of the RUNNING thread"
+window_synchronize 1
diff --git a/cfg/active-task-id.cfg b/cfg/cpu/nosv/task-id.cfg
similarity index 72%
rename from cfg/active-task-id.cfg
rename to cfg/cpu/nosv/task-id.cfg
index d5ef89f..be3f913 100644
--- a/cfg/active-task-id.cfg
+++ b/cfg/cpu/nosv/task-id.cfg
@@ -1,30 +1,29 @@
 #ParaverCFG
 ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 1
+ConfigFile.NumWindows: 7
 
 
 ################################################################################
-< NEW DISPLAYING WINDOW Active Task ID >
+< NEW DISPLAYING WINDOW CPU: nOS-V TaskID of the RUNNING thread >
 ################################################################################
-window_name Active Task ID
+window_name CPU: nOS-V TaskID of the RUNNING thread
 window_type single
-window_id 1
-window_position_x 960
-window_position_y 374
+window_id 2
+window_position_x 0
+window_position_y 626
 window_width 954
-window_height 324
+window_height 123
 window_comm_lines_enabled true
-window_flags_enabled true
+window_flags_enabled false
 window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
 window_logical_filtered true
 window_physical_filtered false
 window_comm_fromto true
 window_comm_tagsize true
 window_comm_typeval true
-window_units Milliseconds
-window_maximum_y 21.000000000000
-window_minimum_y 2.000000000000
+window_units Microseconds
+window_maximum_y 2000.000000000000
+window_minimum_y 1.000000000000
 window_compute_y_max false
 window_level thread
 window_scale_relative 1.000000000000
@@ -32,13 +31,12 @@ window_end_time_relative 1.000000000000
 window_object appl { 1, { All } }
 window_begin_time_relative 0.000000000000
 window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
+window_drawmode draw_randnotzero
+window_drawmode_rows draw_randnotzero
 window_pixel_size 1
 window_labels_to_draw 1
 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
 window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
 window_filter_module evt_type 1 10
-window_filter_module evt_type_label 1 "Unknown"
+window_filter_module evt_type_label 1 "CPU: nOS-V TaskID of the RUNNING thread"
 window_synchronize 1
-
diff --git a/cfg/cpu-nosv-task-rank.cfg b/cfg/cpu/nosv/task-rank.cfg
similarity index 100%
rename from cfg/cpu-nosv-task-rank.cfg
rename to cfg/cpu/nosv/task-rank.cfg
diff --git a/cfg/active-task-type-id.cfg b/cfg/cpu/nosv/task-type.cfg
similarity index 72%
rename from cfg/active-task-type-id.cfg
rename to cfg/cpu/nosv/task-type.cfg
index f6d94b9..49887c7 100644
--- a/cfg/active-task-type-id.cfg
+++ b/cfg/cpu/nosv/task-type.cfg
@@ -1,30 +1,29 @@
 #ParaverCFG
 ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 1
+ConfigFile.NumWindows: 7
 
 
 ################################################################################
-< NEW DISPLAYING WINDOW Active Task Type ID >
+< NEW DISPLAYING WINDOW CPU: nOS-V task type of the RUNNING thread >
 ################################################################################
-window_name Active Task Type ID
+window_name CPU: nOS-V task type of the RUNNING thread
 window_type single
-window_id 1
-window_position_x 960
-window_position_y 725
+window_id 3
+window_position_x 0
+window_position_y 24
 window_width 954
-window_height 324
+window_height 124
 window_comm_lines_enabled true
-window_flags_enabled true
+window_flags_enabled false
 window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
 window_logical_filtered true
 window_physical_filtered false
 window_comm_fromto true
 window_comm_tagsize true
 window_comm_typeval true
-window_units Milliseconds
-window_maximum_y 21.000000000000
-window_minimum_y 2.000000000000
+window_units Microseconds
+window_maximum_y 777.000000000000
+window_minimum_y 1.000000000000
 window_compute_y_max false
 window_level thread
 window_scale_relative 1.000000000000
@@ -32,13 +31,12 @@ window_end_time_relative 1.000000000000
 window_object appl { 1, { All } }
 window_begin_time_relative 0.000000000000
 window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
+window_drawmode draw_randnotzero
+window_drawmode_rows draw_randnotzero
 window_pixel_size 1
 window_labels_to_draw 1
 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
 window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
 window_filter_module evt_type 1 11
-window_filter_module evt_type_label 1 "Unknown"
+window_filter_module evt_type_label 1 "CPU: nOS-V task type of the RUNNING thread"
 window_synchronize 1
-
diff --git a/cfg/cpu-openmp-mode.cfg b/cfg/cpu/openmp/mode.cfg
similarity index 100%
rename from cfg/cpu-openmp-mode.cfg
rename to cfg/cpu/openmp/mode.cfg
diff --git a/cfg/cpu/ovni/cpu.cfg b/cfg/cpu/ovni/cpu.cfg
deleted file mode 100644
index 45e6360..0000000
--- a/cfg/cpu/ovni/cpu.cfg
+++ /dev/null
@@ -1,273 +0,0 @@
-#ParaverCFG
-ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 7
-
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: PID of the RUNNING thread >
-################################################################################
-window_name CPU: PID of the RUNNING thread
-window_type single
-window_id 1
-window_position_x 0
-window_position_y 476
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 113346.000000000000
-window_minimum_y 777.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 1
-window_filter_module evt_type_label 1 "CPU: PID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: nOS-V TaskID of the RUNNING thread >
-################################################################################
-window_name CPU: nOS-V TaskID of the RUNNING thread
-window_type single
-window_id 2
-window_position_x 0
-window_position_y 626
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 2000.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 8
-window_filter_module evt_type_label 1 "CPU: nOS-V TaskID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: nOS-V task type of the RUNNING thread >
-################################################################################
-window_name CPU: nOS-V task type of the RUNNING thread
-window_type single
-window_id 3
-window_position_x 0
-window_position_y 24
-window_width 954
-window_height 124
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 777.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 11
-window_filter_module evt_type_label 1 "CPU: nOS-V task type of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: Number of RUNNING threads >
-################################################################################
-window_name CPU: Number of RUNNING threads
-window_type single
-window_id 4
-window_position_x 0
-window_position_y 175
-window_width 954
-window_height 124
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 65.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_random
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 3
-window_filter_module evt_type_label 1 "CPU: Number of RUNNING threads"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: TID of the RUNNING thread >
-################################################################################
-window_name CPU: TID of the RUNNING thread
-window_type single
-window_id 5
-window_position_x 0
-window_position_y 326
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 114243.000000000000
-window_minimum_y 777.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 2
-window_filter_module evt_type_label 1 "CPU: TID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: nOS-V task AppID of the RUNNING thread >
-################################################################################
-window_name CPU: nOS-V task AppID of the RUNNING thread
-window_type single
-window_id 6
-window_position_x 0
-window_position_y 776
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 777.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 12
-window_filter_module evt_type_label 1 "CPU: nOS-V task AppID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW CPU: nOS-V subsystem of the RUNNING thread >
-################################################################################
-window_name CPU: nOS-V subsystem of the RUNNING thread
-window_type single
-window_id 7
-window_position_x 0
-window_position_y 926
-window_width 954
-window_height 123
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 777.000000000000
-window_minimum_y 6.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 13
-window_filter_module evt_type_label 1 "CPU: nOS-V subsystem of the RUNNING thread"
-window_synchronize 1
-
diff --git a/cfg/cpu-flushing.cfg b/cfg/cpu/ovni/flushing.cfg
similarity index 100%
rename from cfg/cpu-flushing.cfg
rename to cfg/cpu/ovni/flushing.cfg
diff --git a/cfg/cpu/ovni/number-threads-running.cfg b/cfg/cpu/ovni/number-running-threads.cfg
similarity index 100%
rename from cfg/cpu/ovni/number-threads-running.cfg
rename to cfg/cpu/ovni/number-running-threads.cfg
diff --git a/cfg/cpu-tampi-mode.cfg b/cfg/cpu/tampi/mode.cfg
similarity index 100%
rename from cfg/cpu-tampi-mode.cfg
rename to cfg/cpu/tampi/mode.cfg
diff --git a/cfg/thread.cfg b/cfg/thread.cfg
deleted file mode 100644
index c628733..0000000
--- a/cfg/thread.cfg
+++ /dev/null
@@ -1,157 +0,0 @@
-#ParaverCFG
-ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 4
-
-
-################################################################################
-< NEW DISPLAYING WINDOW Thread: State of the CURRENT thread >
-################################################################################
-window_name Thread: State of the CURRENT thread
-window_type single
-window_id 1
-window_position_x 960
-window_position_y 287
-window_width 954
-window_height 236
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 5.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 4
-window_filter_module evt_type_label 1 "Thread: State of the CURRENT thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Thread: TID of the RUNNING thread >
-################################################################################
-window_name Thread: TID of the RUNNING thread
-window_type single
-window_id 2
-window_position_x 960
-window_position_y 550
-window_width 954
-window_height 236
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 114243.000000000000
-window_minimum_y 9915.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 2
-window_filter_module evt_type_label 1 "Thread: TID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Thread: nOS-V subsystem of the ACTIVE thread >
-################################################################################
-window_name Thread: nOS-V subsystem of the ACTIVE thread
-window_type single
-window_id 3
-window_position_x 960
-window_position_y 813
-window_width 954
-window_height 236
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 52.000000000000
-window_minimum_y 6.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 13
-window_filter_module evt_type_label 1 "Thread: nOS-V subsystem of the ACTIVE thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Thread: CPU affinity of the CURRENT thread >
-################################################################################
-window_name Thread: CPU affinity of the CURRENT thread
-window_type single
-window_id 4
-window_position_x 960
-window_position_y 24
-window_width 954
-window_height 236
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 260.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 6
-window_filter_module evt_type_label 1 "Thread: CPU affinity of the CURRENT thread"
-window_synchronize 1
-
diff --git a/cfg/thread-kernel-context-switch.cfg b/cfg/thread/kernel/context-switch.cfg
similarity index 100%
rename from cfg/thread-kernel-context-switch.cfg
rename to cfg/thread/kernel/context-switch.cfg
diff --git a/cfg/thread-nodes-subsystem.cfg b/cfg/thread/nodes/subsystem.cfg
similarity index 100%
rename from cfg/thread-nodes-subsystem.cfg
rename to cfg/thread/nodes/subsystem.cfg
diff --git a/cfg/active-pid.cfg b/cfg/thread/nosv/subsystem.cfg
similarity index 70%
rename from cfg/active-pid.cfg
rename to cfg/thread/nosv/subsystem.cfg
index bbfcd08..5d5f166 100644
--- a/cfg/active-pid.cfg
+++ b/cfg/thread/nosv/subsystem.cfg
@@ -1,30 +1,29 @@
 #ParaverCFG
 ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 1
+ConfigFile.NumWindows: 4
 
 
 ################################################################################
-< NEW DISPLAYING WINDOW Active PID >
+< NEW DISPLAYING WINDOW Thread: nOS-V subsystem of the ACTIVE thread >
 ################################################################################
-window_name Active PID
+window_name Thread: nOS-V subsystem of the ACTIVE thread
 window_type single
-window_id 1
+window_id 3
 window_position_x 960
-window_position_y 24
+window_position_y 813
 window_width 954
-window_height 323
+window_height 236
 window_comm_lines_enabled true
-window_flags_enabled true
+window_flags_enabled false
 window_noncolor_mode true
-window_color_mode window_in_null_gradient_mode
 window_logical_filtered true
 window_physical_filtered false
 window_comm_fromto true
 window_comm_tagsize true
 window_comm_typeval true
-window_units Milliseconds
-window_maximum_y 287531.000000000000
-window_minimum_y 287530.000000000000
+window_units Microseconds
+window_maximum_y 52.000000000000
+window_minimum_y 6.000000000000
 window_compute_y_max false
 window_level thread
 window_scale_relative 1.000000000000
@@ -32,13 +31,12 @@ window_end_time_relative 1.000000000000
 window_object appl { 1, { All } }
 window_begin_time_relative 0.000000000000
 window_open true
-window_drawmode draw_maximum
-window_drawmode_rows draw_maximum
+window_drawmode draw_randnotzero
+window_drawmode_rows draw_randnotzero
 window_pixel_size 1
 window_labels_to_draw 1
 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
 window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 1
-window_filter_module evt_type_label 1 "Unknown"
+window_filter_module evt_type 1 13
+window_filter_module evt_type_label 1 "Thread: nOS-V subsystem of the ACTIVE thread"
 window_synchronize 1
-
diff --git a/cfg/thread-nosv-task-rank.cfg b/cfg/thread/nosv/task-rank.cfg
similarity index 100%
rename from cfg/thread-nosv-task-rank.cfg
rename to cfg/thread/nosv/task-rank.cfg
diff --git a/cfg/thread-openmp-mode.cfg b/cfg/thread/openmp/mode.cfg
similarity index 100%
rename from cfg/thread-openmp-mode.cfg
rename to cfg/thread/openmp/mode.cfg
diff --git a/cfg/thread-flushing.cfg b/cfg/thread/ovni/flushing.cfg
similarity index 100%
rename from cfg/thread-flushing.cfg
rename to cfg/thread/ovni/flushing.cfg
diff --git a/cfg/thread/ovni/thread.cfg b/cfg/thread/ovni/thread.cfg
deleted file mode 100644
index c628733..0000000
--- a/cfg/thread/ovni/thread.cfg
+++ /dev/null
@@ -1,157 +0,0 @@
-#ParaverCFG
-ConfigFile.Version: 3.4
-ConfigFile.NumWindows: 4
-
-
-################################################################################
-< NEW DISPLAYING WINDOW Thread: State of the CURRENT thread >
-################################################################################
-window_name Thread: State of the CURRENT thread
-window_type single
-window_id 1
-window_position_x 960
-window_position_y 287
-window_width 954
-window_height 236
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 5.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 4
-window_filter_module evt_type_label 1 "Thread: State of the CURRENT thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Thread: TID of the RUNNING thread >
-################################################################################
-window_name Thread: TID of the RUNNING thread
-window_type single
-window_id 2
-window_position_x 960
-window_position_y 550
-window_width 954
-window_height 236
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 114243.000000000000
-window_minimum_y 9915.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 2
-window_filter_module evt_type_label 1 "Thread: TID of the RUNNING thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Thread: nOS-V subsystem of the ACTIVE thread >
-################################################################################
-window_name Thread: nOS-V subsystem of the ACTIVE thread
-window_type single
-window_id 3
-window_position_x 960
-window_position_y 813
-window_width 954
-window_height 236
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 52.000000000000
-window_minimum_y 6.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 13
-window_filter_module evt_type_label 1 "Thread: nOS-V subsystem of the ACTIVE thread"
-window_synchronize 1
-
-################################################################################
-< NEW DISPLAYING WINDOW Thread: CPU affinity of the CURRENT thread >
-################################################################################
-window_name Thread: CPU affinity of the CURRENT thread
-window_type single
-window_id 4
-window_position_x 960
-window_position_y 24
-window_width 954
-window_height 236
-window_comm_lines_enabled true
-window_flags_enabled false
-window_noncolor_mode true
-window_logical_filtered true
-window_physical_filtered false
-window_comm_fromto true
-window_comm_tagsize true
-window_comm_typeval true
-window_units Microseconds
-window_maximum_y 260.000000000000
-window_minimum_y 1.000000000000
-window_compute_y_max false
-window_level thread
-window_scale_relative 1.000000000000
-window_end_time_relative 1.000000000000
-window_object appl { 1, { All } }
-window_begin_time_relative 0.000000000000
-window_open true
-window_drawmode draw_randnotzero
-window_drawmode_rows draw_randnotzero
-window_pixel_size 1
-window_labels_to_draw 1
-window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
-window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
-window_filter_module evt_type 1 6
-window_filter_module evt_type_label 1 "Thread: CPU affinity of the CURRENT thread"
-window_synchronize 1
-
diff --git a/cfg/thread-tampi-mode.cfg b/cfg/thread/tampi/mode.cfg
similarity index 100%
rename from cfg/thread-tampi-mode.cfg
rename to cfg/thread/tampi/mode.cfg