diff --git a/applications/algorithms/machinery/build.gradle b/applications/algorithms/machinery/build.gradle
index f4b5a39b43..ef3afcf50a 100644
--- a/applications/algorithms/machinery/build.gradle
+++ b/applications/algorithms/machinery/build.gradle
@@ -12,9 +12,12 @@ dependencies {
     }
 
     implementation project(':algo-common')
+    // `CypherMapWrapper`
+    implementation project(':annotations')
     implementation project(':config-api')
     implementation project(':core')
     implementation project(':core-write')
+    implementation project(':defaults-and-limits-configuration')
     implementation project(':graph-store-catalog-results')
     implementation project(':graph-schema-api')
     implementation project(':logging')
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/AlgoConfigParser.java b/applications/algorithms/machinery/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/AlgoConfigParser.java
similarity index 100%
rename from procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/AlgoConfigParser.java
rename to applications/algorithms/machinery/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/AlgoConfigParser.java
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/NewConfigFunction.java b/applications/algorithms/machinery/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/NewConfigFunction.java
similarity index 100%
rename from procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/NewConfigFunction.java
rename to applications/algorithms/machinery/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/NewConfigFunction.java
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/ProcConfigParser.java b/applications/algorithms/machinery/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/ProcConfigParser.java
similarity index 88%
rename from procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/ProcConfigParser.java
rename to applications/algorithms/machinery/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/ProcConfigParser.java
index b683b9f621..d81ec1e2e1 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/ProcConfigParser.java
+++ b/applications/algorithms/machinery/src/main/java/org/neo4j/gds/procedures/algorithms/configuration/ProcConfigParser.java
@@ -21,6 +21,8 @@
 
 import java.util.Map;
 
+// This is only used in the `executor` framework: `ExecutorSpec` and `ProcedureExecutorSpec`
+@Deprecated(forRemoval = true)
 @FunctionalInterface
 public interface ProcConfigParser<CONFIG> {
     CONFIG processInput(Map<String, Object> configuration);
diff --git a/pipeline/build.gradle b/pipeline/build.gradle
index 5444f2ba7b..e83aaf8b90 100644
--- a/pipeline/build.gradle
+++ b/pipeline/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 
     implementation openGds.reflections
 
-    implementation project(':algo')
+//    implementation project(':algo')
     implementation project(':algo-common')
     implementation project(':algorithms-facade-api')
     implementation project(':algorithms-machinery')
diff --git a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/CanonicalProcedureName.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/CanonicalProcedureName.java
similarity index 98%
rename from procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/CanonicalProcedureName.java
rename to pipeline/src/main/java/org/neo4j/gds/ml/pipeline/CanonicalProcedureName.java
index b9fb702de5..34e26517da 100644
--- a/procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/CanonicalProcedureName.java
+++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/CanonicalProcedureName.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.gds.procedures.algorithms;
+package org.neo4j.gds.ml.pipeline;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/MutateModeAlgorithmLibrary.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/MutateModeAlgorithmLibrary.java
index 825e83c6e8..e5940a0d4a 100644
--- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/MutateModeAlgorithmLibrary.java
+++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/MutateModeAlgorithmLibrary.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.ml.pipeline;
 
 import org.neo4j.gds.applications.algorithms.metadata.Algorithm;
-import org.neo4j.gds.procedures.algorithms.CanonicalProcedureName;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/NodePropertyStepFactoryUsingStubs.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/NodePropertyStepFactoryUsingStubs.java
index f51f8c4ea6..20773e4231 100644
--- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/NodePropertyStepFactoryUsingStubs.java
+++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/NodePropertyStepFactoryUsingStubs.java
@@ -22,7 +22,6 @@
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel;
 import org.neo4j.gds.configuration.DefaultsConfiguration;
 import org.neo4j.gds.configuration.LimitsConfiguration;
-import org.neo4j.gds.procedures.algorithms.CanonicalProcedureName;
 import org.neo4j.gds.procedures.algorithms.configuration.ConfigurationParser;
 
 import java.util.List;
diff --git a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/StubPoweredNodePropertyStep.java b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/StubPoweredNodePropertyStep.java
index 1312016ddf..37ea901331 100644
--- a/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/StubPoweredNodePropertyStep.java
+++ b/pipeline/src/main/java/org/neo4j/gds/ml/pipeline/StubPoweredNodePropertyStep.java
@@ -31,7 +31,6 @@
 import org.neo4j.gds.mem.MemoryEstimations;
 import org.neo4j.gds.mem.MemoryRange;
 import org.neo4j.gds.procedures.algorithms.AlgorithmsProcedureFacade;
-import org.neo4j.gds.procedures.algorithms.CanonicalProcedureName;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/procedures/algorithms-facade/src/test/java/org/neo4j/gds/procedures/algorithms/CanonicalProcedureNameTest.java b/pipeline/src/test/java/org/neo4j/gds/ml/pipeline/CanonicalProcedureNameTest.java
similarity index 98%
rename from procedures/algorithms-facade/src/test/java/org/neo4j/gds/procedures/algorithms/CanonicalProcedureNameTest.java
rename to pipeline/src/test/java/org/neo4j/gds/ml/pipeline/CanonicalProcedureNameTest.java
index 1f1164bdd3..d97f99b128 100644
--- a/procedures/algorithms-facade/src/test/java/org/neo4j/gds/procedures/algorithms/CanonicalProcedureNameTest.java
+++ b/pipeline/src/test/java/org/neo4j/gds/ml/pipeline/CanonicalProcedureNameTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.gds.procedures.algorithms;
+package org.neo4j.gds.ml.pipeline;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;