diff --git a/grid/walk/v2/GridWalker.h b/grid/walk/v2/GridWalker.h
index 737caa6..b0154fd 100644
--- a/grid/walk/v2/GridWalker.h
+++ b/grid/walk/v2/GridWalker.h
@@ -5,7 +5,7 @@
 #include "../../Grid.h"
 #include "../../../math/DrawList.h"
 #include "modules/WalkModule.h"
-#include "../../../math/Distributions.h"
+#include "../../../math/distribution/Normal.h"
 #include "../../../math/Stats.h"
 
 /**
diff --git a/grid/walk/v2/modules/WalkModuleActivityControl.h b/grid/walk/v2/modules/WalkModuleActivityControl.h
index 075f54b..a5645fc 100644
--- a/grid/walk/v2/modules/WalkModuleActivityControl.h
+++ b/grid/walk/v2/modules/WalkModuleActivityControl.h
@@ -4,7 +4,7 @@
 #include "WalkModule.h"
 
 #include "../../../../geo/Heading.h"
-#include "../../../../math/Distributions.h"
+#include "../../../../math/distribution/Normal.h"
 
 #include "../../../../sensors/activity/ActivityButterPressure.h"
 
diff --git a/grid/walk/v2/modules/WalkModuleFavorZ.h b/grid/walk/v2/modules/WalkModuleFavorZ.h
index eacc910..3893329 100644
--- a/grid/walk/v2/modules/WalkModuleFavorZ.h
+++ b/grid/walk/v2/modules/WalkModuleFavorZ.h
@@ -5,7 +5,7 @@
 #include "WalkStateHeading.h"
 
 #include "../../../../geo/Heading.h"
-#include "../../../../math/Distributions.h"
+#include "../../../../math/distribution/Normal.h"
 
 #include "../../../../Assertions.h"
 
diff --git a/grid/walk/v2/modules/WalkModuleFollowDestination.h b/grid/walk/v2/modules/WalkModuleFollowDestination.h
index b92be94..9f66641 100644
--- a/grid/walk/v2/modules/WalkModuleFollowDestination.h
+++ b/grid/walk/v2/modules/WalkModuleFollowDestination.h
@@ -7,7 +7,7 @@
 #include "../../../../nav/dijkstra/Dijkstra.h"
 #include "../../../../nav/dijkstra/DijkstraPath.h"
 
-#include "../../../../math/Distributions.h"
+#include "../../../../math/distribution/Normal.h"
 #include "../../../../Assertions.h"
 
 
diff --git a/grid/walk/v2/modules/WalkModuleHeadingControl.h b/grid/walk/v2/modules/WalkModuleHeadingControl.h
index a79cdad..0eb0651 100644
--- a/grid/walk/v2/modules/WalkModuleHeadingControl.h
+++ b/grid/walk/v2/modules/WalkModuleHeadingControl.h
@@ -5,8 +5,9 @@
 #include "WalkStateHeading.h"
 
 #include "../../../../geo/Heading.h"
-#include "../../../../math/Distributions.h"
-
+#include "../../../../math/distribution/Normal.h"
+#include "../../../../math/distribution/LUT.h"
+#include "../../../../math/distribution/VonMises.h"
 
 /** keep the state's heading */
 template <typename Node, typename WalkState, typename Control> class WalkModuleHeadingControl : public WalkModule<Node, WalkState> {
diff --git a/sensors/radio/WiFiProbabilityFree.h b/sensors/radio/WiFiProbabilityFree.h
index 7f4a02a..c7ae6c5 100644
--- a/sensors/radio/WiFiProbabilityFree.h
+++ b/sensors/radio/WiFiProbabilityFree.h
@@ -3,7 +3,9 @@
 
 #include "WiFiProbability.h"
 #include "model/WiFiModel.h"
-#include "../../math/Distributions.h"
+#include "../../math/distribution/Normal.h"
+#include "../../math/distribution/Region.h"
+#include "../../math/distribution/Exponential.h"
 #include "VAPGrouper.h"
 #include "../../floorplan/v2/Floorplan.h"
 
diff --git a/sensors/radio/WiFiProbabilityGrid.h b/sensors/radio/WiFiProbabilityGrid.h
index 840d1dd..d6aff4e 100644
--- a/sensors/radio/WiFiProbabilityGrid.h
+++ b/sensors/radio/WiFiProbabilityGrid.h
@@ -3,7 +3,7 @@
 
 #include <fstream>
 
-#include "../../math/Distributions.h"
+#include "../../math/distribution/Normal.h"
 #include "../../data/Timestamp.h"
 
 #include "WiFiGridNode.h"