Rename package for nc proc classes

FlorentinD · Mats-SX · FlorentinD · commit dc9f36824312 · 2022-04-27T11:36:54.000+02:00
Co-authored-by: Mats Rydberg &lt;mats@neotechnology.com&gt;
diff --git a/doc-test/src/test/java/org/neo4j/gds/doc/NodeClassificationPipelineDocTest.java b/doc-test/src/test/java/org/neo4j/gds/doc/NodeClassificationPipelineDocTest.java
@@ -23,16 +23,16 @@
 import org.neo4j.gds.catalog.GraphProjectProc;
 import org.neo4j.gds.catalog.GraphStreamNodePropertiesProc;
 import org.neo4j.gds.functions.AsNodeFunc;
-import org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineAddStepProcs;
-import org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineAddTrainerMethodProcs;
-import org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineConfigureAutoTuningProc;
-import org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineConfigureSplitProc;
-import org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCreateProc;
-import org.neo4j.gds.ml.nodemodels.pipeline.predict.NodeClassificationPipelineMutateProc;
-import org.neo4j.gds.ml.nodemodels.pipeline.predict.NodeClassificationPipelineStreamProc;
-import org.neo4j.gds.ml.nodemodels.pipeline.predict.NodeClassificationPipelineTrainProc;
-import org.neo4j.gds.ml.nodemodels.pipeline.predict.NodeClassificationPipelineWriteProc;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
+import org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineAddStepProcs;
+import org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineAddTrainerMethodProcs;
+import org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineConfigureAutoTuningProc;
+import org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineConfigureSplitProc;
+import org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCreateProc;
+import org.neo4j.gds.ml.pipeline.node.classification.predict.NodeClassificationPipelineMutateProc;
+import org.neo4j.gds.ml.pipeline.node.classification.predict.NodeClassificationPipelineStreamProc;
+import org.neo4j.gds.ml.pipeline.node.classification.predict.NodeClassificationPipelineTrainProc;
+import org.neo4j.gds.ml.pipeline.node.classification.predict.NodeClassificationPipelineWriteProc;
 import org.neo4j.gds.scaling.ScalePropertiesMutateProc;
 
 import java.util.List;
diff --git a/doc-test/src/test/java/org/neo4j/gds/doc/PipelineCatalogExistsDocTest.java b/doc-test/src/test/java/org/neo4j/gds/doc/PipelineCatalogExistsDocTest.java
@@ -20,8 +20,8 @@
 package org.neo4j.gds.doc;
 
 import org.junit.jupiter.api.AfterEach;
-import org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCreateProc;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
+import org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCreateProc;
 import org.neo4j.gds.pipeline.catalog.PipelineExistsProc;
 
 import java.util.List;
diff --git a/doc-test/src/test/java/org/neo4j/gds/doc/PipelineCatalogListDocTest.java b/doc-test/src/test/java/org/neo4j/gds/doc/PipelineCatalogListDocTest.java
@@ -21,8 +21,8 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.neo4j.gds.ml.linkmodels.pipeline.LinkPredictionPipelineCreateProc;
-import org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCreateProc;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
+import org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCreateProc;
 import org.neo4j.gds.pipeline.catalog.PipelineListProc;
 
 import java.util.List;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddStepProcs.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddStepProcs.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddTrainerMethodProcs.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddTrainerMethodProcs.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.core.ConfigKeyValidation;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineCompanion.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineCompanion.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.neo4j.gds.ml.models.TrainingMethod;
 
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureAutoTuningProc.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureAutoTuningProc.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.ml.PipelineCompanion;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureSplitProc.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureSplitProc.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.core.CypherMapWrapper;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineCreateProc.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineCreateProc.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.core.StringIdentifierValidations;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/PipelineInfoResult.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/PipelineInfoResult.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.neo4j.gds.ml.pipeline.ExecutableNodePropertyStep;
 import org.neo4j.gds.ml.pipeline.TrainingPipeline;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineCompanion.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineCompanion.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.neo4j.gds.NodeLabel;
 import org.neo4j.gds.api.GraphStore;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineMutateProc.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineMutateProc.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.neo4j.gds.AlgorithmFactory;
 import org.neo4j.gds.GraphStoreAlgorithmFactory;
@@ -47,10 +47,8 @@
 
 import static org.neo4j.gds.executor.ExecutionMode.MUTATE_NODE_PROPERTY;
 import static org.neo4j.gds.ml.PipelineCompanion.prepareTrainConfig;
-import static org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION;
-import static org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION;
 
-@GdsCallable(name = "gds.beta.pipeline.nodeClassification.predict.mutate", description = PREDICT_DESCRIPTION, executionMode = MUTATE_NODE_PROPERTY)
+@GdsCallable(name = "gds.beta.pipeline.nodeClassification.predict.mutate", description = org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION, executionMode = MUTATE_NODE_PROPERTY)
 public class NodeClassificationPipelineMutateProc
     extends MutatePropertyProc<
     NodeClassificationPredictPipelineExecutor,
@@ -59,7 +57,7 @@ public class NodeClassificationPipelineMutateProc
     NodeClassificationPredictPipelineMutateConfig>
 {
     @Procedure(name = "gds.beta.pipeline.nodeClassification.predict.mutate", mode = Mode.READ)
-    @Description(PREDICT_DESCRIPTION)
+    @Description(org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION)
     public Stream<MutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
@@ -69,7 +67,7 @@ public Stream<MutateResult> mutate(
     }
 
     @Procedure(name = "gds.beta.pipeline.nodeClassification.predict.mutate.estimate", mode = Mode.READ)
-    @Description(ESTIMATE_PREDICT_DESCRIPTION)
+    @Description(org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION)
     public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineStreamProc.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineStreamProc.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.neo4j.gds.AlgorithmFactory;
 import org.neo4j.gds.GraphStoreAlgorithmFactory;
@@ -47,8 +47,8 @@
 
 import static org.neo4j.gds.executor.ExecutionMode.STREAM;
 import static org.neo4j.gds.ml.PipelineCompanion.prepareTrainConfig;
-import static org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION;
-import static org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION;
+import static org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION;
+import static org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION;
 
 @GdsCallable(name = "gds.beta.pipeline.nodeClassification.predict.stream", description = PREDICT_DESCRIPTION, executionMode = STREAM)
 public class NodeClassificationPipelineStreamProc
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineTrainProc.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineTrainProc.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.neo4j.gds.GraphStoreAlgorithmFactory;
 import org.neo4j.gds.TrainProc;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineWriteProc.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineWriteProc.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.neo4j.gds.AlgorithmFactory;
 import org.neo4j.gds.GraphStoreAlgorithmFactory;
@@ -48,8 +48,8 @@
 
 import static org.neo4j.gds.executor.ExecutionMode.WRITE_NODE_PROPERTY;
 import static org.neo4j.gds.ml.PipelineCompanion.prepareTrainConfig;
-import static org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION;
-import static org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION;
+import static org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION;
+import static org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION;
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
 @GdsCallable(name = "gds.beta.pipeline.nodeClassification.predict.write", description = PREDICT_DESCRIPTION, executionMode = WRITE_NODE_PROPERTY)
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineAlgorithmFactory.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineAlgorithmFactory.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.neo4j.gds.GraphStoreAlgorithmFactory;
 import org.neo4j.gds.api.GraphStore;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineBaseConfig.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineBaseConfig.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.neo4j.gds.annotation.Configuration;
 import org.neo4j.gds.annotation.ValueClass;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineExecutor.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineExecutor.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 
 import org.neo4j.gds.api.GraphStore;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineMutateConfig.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineMutateConfig.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.immutables.value.Value;
 import org.neo4j.gds.annotation.Configuration;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineStreamConfig.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineStreamConfig.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.immutables.value.Value;
 import org.neo4j.gds.annotation.Configuration;
diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineWriteConfig.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineWriteConfig.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.ml.nodemodels.pipeline.predict;
+package org.neo4j.gds.ml.pipeline.node.classification.predict;
 
 import org.immutables.value.Value;
 import org.neo4j.gds.annotation.Configuration;
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddStepProcsTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddStepProcsTest.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,7 +32,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCompanion.DEFAULT_PARAM_CONFIG;
 import static org.neo4j.gds.ml.pipeline.nodePipeline.NodePropertyPredictionSplitConfig.DEFAULT_CONFIG;
 
 class NodeClassificationPipelineAddStepProcsTest extends BaseProcTest {
@@ -63,7 +62,7 @@ void shouldAddNodePropertyStep() {
                 "config", Map.of("mutateProperty", "pr")
             )));
         assertThat(result.featureProperties).isEqualTo(List.of());
-        assertThat(result.parameterSpace).isEqualTo(DEFAULT_PARAM_CONFIG);
+        assertThat(result.parameterSpace).isEqualTo(NodeClassificationPipelineCompanion.DEFAULT_PARAM_CONFIG);
     }
 
     @Test
@@ -82,7 +81,7 @@ void shouldSelectFeatures() {
         assertThat(result.splitConfig).isEqualTo(DEFAULT_CONFIG.toMap());
         assertThat(result.nodePropertySteps).isEqualTo(List.of());
         assertThat(result.featureProperties).isEqualTo(List.of("test", "pr", "pr2"));
-        assertThat(result.parameterSpace).isEqualTo(DEFAULT_PARAM_CONFIG);
+        assertThat(result.parameterSpace).isEqualTo(NodeClassificationPipelineCompanion.DEFAULT_PARAM_CONFIG);
     }
 
     @Test
@@ -156,7 +155,7 @@ void shouldAddNodeAndSelectFeatureProperties() {
                 "config", Map.of("mutateProperty", "pr")
             )));
         assertThat(result.featureProperties).isEqualTo(List.of("pr", "pr2"));
-        assertThat(result.parameterSpace).isEqualTo(DEFAULT_PARAM_CONFIG);
+        assertThat(result.parameterSpace).isEqualTo(NodeClassificationPipelineCompanion.DEFAULT_PARAM_CONFIG);
     }
 
     @Test
@@ -187,7 +186,7 @@ void shouldAddTwoNodePropertySteps() {
             )
         );
         assertThat(result.featureProperties).isEqualTo(List.of());
-        assertThat(result.parameterSpace).isEqualTo(DEFAULT_PARAM_CONFIG);
+        assertThat(result.parameterSpace).isEqualTo(NodeClassificationPipelineCompanion.DEFAULT_PARAM_CONFIG);
     }
 
     @Test
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddTrainerMethodProcsTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddTrainerMethodProcsTest.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.ml.nodemodels.pipeline;
+package org.neo4j.gds.ml.pipeline.node.classification;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -30,7 +30,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.neo4j.gds.ml.nodemodels.pipeline.NodeClassificationPipelineCompanion.DEFAULT_SPLIT_CONFIG;
 import static org.neo4j.gds.ml.pipeline.AutoTuningConfig.MAX_TRIALS;
 
 
@@ -54,7 +53,7 @@ void shouldSetLRParams() {
             "CALL gds.beta.pipeline.nodeClassification.addLogisticRegression('myPipeline', {minEpochs: 42})",
             List.of(Map.of(
                 "name", "myPipeline",
-                "splitConfig", DEFAULT_SPLIT_CONFIG,
+                "splitConfig", NodeClassificationPipelineCompanion.DEFAULT_SPLIT_CONFIG,
                 "autoTuningConfig", Map.of("maxTrials", MAX_TRIALS),
                 "nodePropertySteps", List.of(),
                 "featureProperties", List.of(),
@@ -81,7 +80,7 @@ void shouldSetRFParams() {
             "CALL gds.alpha.pipeline.nodeClassification.addRandomForest('myPipeline', {maxDepth: 42, maxFeaturesRatio: 0.5, numberOfDecisionTrees: 10, minSplitSize: 2})",
             List.of(Map.of(
                 "name", "myPipeline",
-                "splitConfig", DEFAULT_SPLIT_CONFIG,
+                "splitConfig", NodeClassificationPipelineCompanion.DEFAULT_SPLIT_CONFIG,
                 "autoTuningConfig", Map.of("maxTrials", MAX_TRIALS),
                 "nodePropertySteps", List.of(),
                 "featureProperties", List.of(),
@@ -109,7 +108,7 @@ void shouldKeepBothConfigs() {
             "CALL gds.beta.pipeline.nodeClassification.addLogisticRegression('myPipeline', {minEpochs: 4})",
             List.of(Map.of("name",
                 "myPipeline",
-                "splitConfig", DEFAULT_SPLIT_CONFIG,
+                "splitConfig", NodeClassificationPipelineCompanion.DEFAULT_SPLIT_CONFIG,
                 "autoTuningConfig", Map.of("maxTrials", MAX_TRIALS),
                 "nodePropertySteps", List.of(),
                 "featureProperties", List.of(),
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureAutoTuningProcTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureAutoTuningProcTest.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureSplitProcTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureSplitProcTest.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineCreateProcTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineCreateProcTest.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineIntegrationTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineIntegrationTest.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineMutateProcTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineMutateProcTest.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelinePredictProcTestUtil.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelinePredictProcTestUtil.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineStreamProcTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineStreamProcTest.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineTrainProcTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineTrainProcTest.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineWriteProcTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineWriteProcTest.java
diff --git a/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineExecutorTest.java b/proc/machine-learning/src/test/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineExecutorTest.java
