diff --git a/apps/probability/Makefile b/apps/probability/Makefile
index e2b73b3d8..f0eca7332 100644
--- a/apps/probability/Makefile
+++ b/apps/probability/Makefile
@@ -1,21 +1,21 @@
 app_objs += $(addprefix apps/probability/,\
   app.o\
-  binomial_law.o\
   calculation.o\
   calculation_controller.o\
   cell.o\
   evaluate_context.o\
-  exponential_law.o\
   image_table_view.o\
-  law.o\
+  law/binomial_law.o\
+  law/exponential_law.o\
+  law/law.o\
+  law/normal_law.o\
+  law/one_parameter_law.o\
+  law/poisson_law.o\
+  law/two_parameter_law.o\
+  law/uniform_law.o\
   law_controller.o\
   law_curve_view.o\
-  normal_law.o\
-  one_parameter_law.o\
   parameters_controller.o\
-  poisson_law.o\
-  two_parameter_law.o\
-  uniform_law.o\
 )
 
 app_images += $(addprefix apps/probability/images/,\
diff --git a/apps/probability/calculation.h b/apps/probability/calculation.h
index 3d4fd9eed..d1887c3a3 100644
--- a/apps/probability/calculation.h
+++ b/apps/probability/calculation.h
@@ -2,7 +2,7 @@
 #define PROBABILITE_CALCULATION_H
 
 #include "evaluate_context.h"
-#include "law.h"
+#include "law/law.h"
 
 namespace Probability {
 
diff --git a/apps/probability/calculation_controller.h b/apps/probability/calculation_controller.h
index 8863d024e..5748160c0 100644
--- a/apps/probability/calculation_controller.h
+++ b/apps/probability/calculation_controller.h
@@ -2,7 +2,7 @@
 #define PROBABILITY_CALCULATION_CONTROLLER_H
 
 #include <escher.h>
-#include "law.h"
+#include "law/law.h"
 #include "law_curve_view.h"
 #include "image_table_view.h"
 
diff --git a/apps/probability/binomial_law.cpp b/apps/probability/law/binomial_law.cpp
similarity index 100%
rename from apps/probability/binomial_law.cpp
rename to apps/probability/law/binomial_law.cpp
diff --git a/apps/probability/binomial_law.h b/apps/probability/law/binomial_law.h
similarity index 95%
rename from apps/probability/binomial_law.h
rename to apps/probability/law/binomial_law.h
index e09d3c0f4..c0b32786c 100644
--- a/apps/probability/binomial_law.h
+++ b/apps/probability/law/binomial_law.h
@@ -1,7 +1,6 @@
 #ifndef PROBABILITE_BINOMIAL_LAW_H
 #define PROBABILITE_BINOMIAL_LAW_H
 
-#include "evaluate_context.h"
 #include "two_parameter_law.h"
 
 namespace Probability {
diff --git a/apps/probability/exponential_law.cpp b/apps/probability/law/exponential_law.cpp
similarity index 100%
rename from apps/probability/exponential_law.cpp
rename to apps/probability/law/exponential_law.cpp
diff --git a/apps/probability/exponential_law.h b/apps/probability/law/exponential_law.h
similarity index 95%
rename from apps/probability/exponential_law.h
rename to apps/probability/law/exponential_law.h
index 8fd18ef7a..164606516 100644
--- a/apps/probability/exponential_law.h
+++ b/apps/probability/law/exponential_law.h
@@ -1,7 +1,6 @@
 #ifndef PROBABILITE_EXPONENTIAL_LAW_H
 #define PROBABILITE_EXPONENTIAL_LAW_H
 
-#include "evaluate_context.h"
 #include "one_parameter_law.h"
 
 namespace Probability {
diff --git a/apps/probability/law.cpp b/apps/probability/law/law.cpp
similarity index 100%
rename from apps/probability/law.cpp
rename to apps/probability/law/law.cpp
diff --git a/apps/probability/law.h b/apps/probability/law/law.h
similarity index 97%
rename from apps/probability/law.h
rename to apps/probability/law/law.h
index d54ec2c7f..731068f3c 100644
--- a/apps/probability/law.h
+++ b/apps/probability/law/law.h
@@ -1,7 +1,7 @@
 #ifndef PROBABILITE_LAW_H
 #define PROBABILITE_LAW_H
 
-#include "evaluate_context.h"
+#include "../evaluate_context.h"
 
 namespace Probability {
 
diff --git a/apps/probability/normal_law.cpp b/apps/probability/law/normal_law.cpp
similarity index 100%
rename from apps/probability/normal_law.cpp
rename to apps/probability/law/normal_law.cpp
diff --git a/apps/probability/normal_law.h b/apps/probability/law/normal_law.h
similarity index 95%
rename from apps/probability/normal_law.h
rename to apps/probability/law/normal_law.h
index 5c398ef64..a913371e5 100644
--- a/apps/probability/normal_law.h
+++ b/apps/probability/law/normal_law.h
@@ -1,7 +1,6 @@
 #ifndef PROBABILITE_NORMAL_LAW_H
 #define PROBABILITE_NORMAL_LAW_H
 
-#include "evaluate_context.h"
 #include "two_parameter_law.h"
 
 namespace Probability {
diff --git a/apps/probability/one_parameter_law.cpp b/apps/probability/law/one_parameter_law.cpp
similarity index 100%
rename from apps/probability/one_parameter_law.cpp
rename to apps/probability/law/one_parameter_law.cpp
diff --git a/apps/probability/one_parameter_law.h b/apps/probability/law/one_parameter_law.h
similarity index 93%
rename from apps/probability/one_parameter_law.h
rename to apps/probability/law/one_parameter_law.h
index 5820361e2..68457904f 100644
--- a/apps/probability/one_parameter_law.h
+++ b/apps/probability/law/one_parameter_law.h
@@ -1,7 +1,6 @@
 #ifndef PROBABILITE_ONE_PARAMETER_LAW_H
 #define PROBABILITE_ONE_PARAMETER_LAW_H
 
-#include "evaluate_context.h"
 #include "law.h"
 
 namespace Probability {
diff --git a/apps/probability/poisson_law.cpp b/apps/probability/law/poisson_law.cpp
similarity index 100%
rename from apps/probability/poisson_law.cpp
rename to apps/probability/law/poisson_law.cpp
diff --git a/apps/probability/poisson_law.h b/apps/probability/law/poisson_law.h
similarity index 95%
rename from apps/probability/poisson_law.h
rename to apps/probability/law/poisson_law.h
index 76a53e239..8ebcc0302 100644
--- a/apps/probability/poisson_law.h
+++ b/apps/probability/law/poisson_law.h
@@ -1,7 +1,6 @@
 #ifndef PROBABILITE_POISSON_LAW_H
 #define PROBABILITE_POISSON_LAW_H
 
-#include "evaluate_context.h"
 #include "one_parameter_law.h"
 
 namespace Probability {
diff --git a/apps/probability/two_parameter_law.cpp b/apps/probability/law/two_parameter_law.cpp
similarity index 100%
rename from apps/probability/two_parameter_law.cpp
rename to apps/probability/law/two_parameter_law.cpp
diff --git a/apps/probability/two_parameter_law.h b/apps/probability/law/two_parameter_law.h
similarity index 93%
rename from apps/probability/two_parameter_law.h
rename to apps/probability/law/two_parameter_law.h
index d92ade023..a20889052 100644
--- a/apps/probability/two_parameter_law.h
+++ b/apps/probability/law/two_parameter_law.h
@@ -1,7 +1,6 @@
 #ifndef PROBABILITE_TWO_PARAMETER_LAW_H
 #define PROBABILITE_TWO_PARAMETER_LAW_H
 
-#include "evaluate_context.h"
 #include "law.h"
 
 namespace Probability {
diff --git a/apps/probability/uniform_law.cpp b/apps/probability/law/uniform_law.cpp
similarity index 100%
rename from apps/probability/uniform_law.cpp
rename to apps/probability/law/uniform_law.cpp
diff --git a/apps/probability/uniform_law.h b/apps/probability/law/uniform_law.h
similarity index 95%
rename from apps/probability/uniform_law.h
rename to apps/probability/law/uniform_law.h
index a50f5d4d3..ac7bb7f5d 100644
--- a/apps/probability/uniform_law.h
+++ b/apps/probability/law/uniform_law.h
@@ -1,7 +1,6 @@
 #ifndef PROBABILITE_UNIFORM_LAW_H
 #define PROBABILITE_UNIFORM_LAW_H
 
-#include "evaluate_context.h"
 #include "two_parameter_law.h"
 
 namespace Probability {
diff --git a/apps/probability/law_controller.cpp b/apps/probability/law_controller.cpp
index fc4c3071b..bbdaa35ef 100644
--- a/apps/probability/law_controller.cpp
+++ b/apps/probability/law_controller.cpp
@@ -1,11 +1,11 @@
 #include "law_controller.h"
 #include <assert.h>
 #include "app.h"
-#include "binomial_law.h"
-#include "exponential_law.h"
-#include "normal_law.h"
-#include "poisson_law.h"
-#include "uniform_law.h"
+#include "law/binomial_law.h"
+#include "law/exponential_law.h"
+#include "law/normal_law.h"
+#include "law/poisson_law.h"
+#include "law/uniform_law.h"
 #include "images/binomial_icon.h"
 #include "images/exponential_icon.h"
 #include "images/normal_icon.h"
diff --git a/apps/probability/law_controller.h b/apps/probability/law_controller.h
index 735cf8972..0856ebd1e 100644
--- a/apps/probability/law_controller.h
+++ b/apps/probability/law_controller.h
@@ -3,7 +3,7 @@
 
 #include <escher.h>
 #include "cell.h"
-#include "law.h"
+#include "law/law.h"
 #include "parameters_controller.h"
 #include "evaluate_context.h"
 
diff --git a/apps/probability/law_curve_view.h b/apps/probability/law_curve_view.h
index ab8aa2c5d..43f402a39 100644
--- a/apps/probability/law_curve_view.h
+++ b/apps/probability/law_curve_view.h
@@ -3,7 +3,7 @@
 
 #include "../curve_view.h"
 #include "../constant.h"
-#include "law.h"
+#include "law/law.h"
 #include <escher.h>
 #include <poincare.h>
 
diff --git a/apps/probability/parameters_controller.h b/apps/probability/parameters_controller.h
index 1a1c842db..d273ded84 100644
--- a/apps/probability/parameters_controller.h
+++ b/apps/probability/parameters_controller.h
@@ -3,7 +3,7 @@
 
 #include <escher.h>
 #include "../float_parameter_controller.h"
-#include "law.h"
+#include "law/law.h"
 #include "calculation_controller.h"
 
 namespace Probability {