diff --git a/foundation-support/gradle/owned-output-patterns.txt b/foundation-support/gradle/owned-output-patterns.txt
index 147108369a..8633c0b5f8 100644
--- a/foundation-support/gradle/owned-output-patterns.txt
+++ b/foundation-support/gradle/owned-output-patterns.txt
@@ -1,5 +1,5 @@
 # Aggregated main outputs that must be pruned on non-clean builds because :foundation-support owns them now.
-# Keep this list limited to the stable generic support subset extracted from :foundation-config.
+# Keep this list limited to the stable generic support subset extracted into :foundation-support.
 
 network/crypta/node/FSParseException*
 network/crypta/support/api/Bucket*
@@ -76,3 +76,4 @@ network/crypta/support/compress/NewLZMACompressor*
 network/crypta/support/compress/OldLZMACompressor*
 network/crypta/support/compress/SingleOffsetReplacingOutputStream*
 network/crypta/support/compress/TooBigDictionaryException*
+network/crypta/support/math/**
diff --git a/src/main/java/network/crypta/support/math/BootstrappingDecayingRunningAverage.java b/foundation-support/src/main/java/network/crypta/support/math/BootstrappingDecayingRunningAverage.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/BootstrappingDecayingRunningAverage.java
rename to foundation-support/src/main/java/network/crypta/support/math/BootstrappingDecayingRunningAverage.java
diff --git a/src/main/java/network/crypta/support/math/DecayingKeyspaceAverage.java b/foundation-support/src/main/java/network/crypta/support/math/DecayingKeyspaceAverage.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/DecayingKeyspaceAverage.java
rename to foundation-support/src/main/java/network/crypta/support/math/DecayingKeyspaceAverage.java
diff --git a/src/main/java/network/crypta/support/math/KeyspaceMath.java b/foundation-support/src/main/java/network/crypta/support/math/KeyspaceMath.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/KeyspaceMath.java
rename to foundation-support/src/main/java/network/crypta/support/math/KeyspaceMath.java
diff --git a/src/main/java/network/crypta/support/math/MersenneTwister.java b/foundation-support/src/main/java/network/crypta/support/math/MersenneTwister.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/MersenneTwister.java
rename to foundation-support/src/main/java/network/crypta/support/math/MersenneTwister.java
diff --git a/src/main/java/network/crypta/support/math/RunningAverage.java b/foundation-support/src/main/java/network/crypta/support/math/RunningAverage.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/RunningAverage.java
rename to foundation-support/src/main/java/network/crypta/support/math/RunningAverage.java
diff --git a/src/main/java/network/crypta/support/math/RunningAverageBounds.java b/foundation-support/src/main/java/network/crypta/support/math/RunningAverageBounds.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/RunningAverageBounds.java
rename to foundation-support/src/main/java/network/crypta/support/math/RunningAverageBounds.java
diff --git a/src/main/java/network/crypta/support/math/SimpleRunningAverage.java b/foundation-support/src/main/java/network/crypta/support/math/SimpleRunningAverage.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/SimpleRunningAverage.java
rename to foundation-support/src/main/java/network/crypta/support/math/SimpleRunningAverage.java
diff --git a/src/main/java/network/crypta/support/math/TimeDecayingRunningAverage.java b/foundation-support/src/main/java/network/crypta/support/math/TimeDecayingRunningAverage.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/TimeDecayingRunningAverage.java
rename to foundation-support/src/main/java/network/crypta/support/math/TimeDecayingRunningAverage.java
diff --git a/src/main/java/network/crypta/support/math/TimeSkewAlertCallback.java b/foundation-support/src/main/java/network/crypta/support/math/TimeSkewAlertCallback.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/TimeSkewAlertCallback.java
rename to foundation-support/src/main/java/network/crypta/support/math/TimeSkewAlertCallback.java
diff --git a/src/main/java/network/crypta/support/math/TrivialRunningAverage.java b/foundation-support/src/main/java/network/crypta/support/math/TrivialRunningAverage.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/TrivialRunningAverage.java
rename to foundation-support/src/main/java/network/crypta/support/math/TrivialRunningAverage.java
diff --git a/src/main/java/network/crypta/support/math/package-info.java b/foundation-support/src/main/java/network/crypta/support/math/package-info.java
similarity index 100%
rename from src/main/java/network/crypta/support/math/package-info.java
rename to foundation-support/src/main/java/network/crypta/support/math/package-info.java