diff --git a/include/widget.h b/include/widget.h
index 5e18065..e17c580 100644
--- a/include/widget.h
+++ b/include/widget.h
@@ -190,12 +190,12 @@ void *widget_get_selected_rule_images();
 /******************************************************************************/
 /*                                    D A T A                                 */
 /******************************************************************************/
-//    called by  : widget / data / dispatch / widget_get_data_page()
-//    defined in : widget / data / measures.c
-//                                 results.c
+//    called by  : widget / results / dispatch / widget_get_data_page()
+//    defined in : widget / results / organize.c
+//                                    display.c
 
-void *widget_get_measures_page();
-void *widget_get_results_page();
+void *widget_get_organize_results_page();
+void *widget_get_display_results_page();
 
 
 /******************************************************************************/
diff --git a/src/widget/data/dispatch.c b/src/widget/results/dispatch.c
similarity index 96%
rename from src/widget/data/dispatch.c
rename to src/widget/results/dispatch.c
index 0b59a1d..562427f 100644
--- a/src/widget/data/dispatch.c
+++ b/src/widget/results/dispatch.c
@@ -40,8 +40,8 @@
 void *widget_get_data_page()
 {
     GtkWidget *measures_and_results = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-    gtk_paned_set_start_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_measures_page()));
-    gtk_paned_set_end_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_results_page()));
+    gtk_paned_set_start_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_organize_results_page()));
+    gtk_paned_set_end_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_display_results_page()));
     gtk_paned_set_position (GTK_PANED (measures_and_results), H_PARTITION_RESULTS);
     gtk_paned_set_shrink_start_child (GTK_PANED (measures_and_results), FALSE);
     gtk_paned_set_shrink_end_child (GTK_PANED (measures_and_results), FALSE);
diff --git a/src/widget/data/results.c b/src/widget/results/display.c
similarity index 98%
rename from src/widget/data/results.c
rename to src/widget/results/display.c
index fcd8392..bd6d0d0 100644
--- a/src/widget/data/results.c
+++ b/src/widget/results/display.c
@@ -31,7 +31,7 @@
 #include "../../../include/signal.h"
 #include "../../../include/widget.h"
 
-void *widget_get_results_page () {
+void *widget_get_display_results_page () {
     GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2));
 
     gtk_box_append (data_box, gtk_button_new_with_label ("evolutions"));
diff --git a/src/widget/data/measure.c b/src/widget/results/organize.c
similarity index 98%
rename from src/widget/data/measure.c
rename to src/widget/results/organize.c
index 33b8bf1..5a25a69 100644
--- a/src/widget/data/measure.c
+++ b/src/widget/results/organize.c
@@ -31,7 +31,7 @@
 #include "../../../include/signal.h"
 #include "../../../include/widget.h"
 
-void *widget_get_measures_page ()
+void *widget_get_organize_results_page ()
 {
     GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 32));