diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
index 91dd21c86..00f7c6c3c 100644
--- a/core/src/main/java/module-info.java
+++ b/core/src/main/java/module-info.java
@@ -97,6 +97,12 @@ open module openrocket.core {
 	exports info.openrocket.core.util.enums;
 	exports info.openrocket.core.utils;
 
+	// Service providers
+	provides info.openrocket.core.optimization.services.OptimizableParameterService with
+			info.openrocket.core.optimization.services.DefaultOptimizableParameterService;
+	provides info.openrocket.core.optimization.services.SimulationModifierService with
+			info.openrocket.core.optimization.services.DefaultSimulationModifierService;
+
 	//opens info.openrocket.core.formatting to com.google.guice;
 	//opens info.openrocket.core.startup to com.google.guice;
 }
\ No newline at end of file
diff --git a/core/src/main/resources/META-INF/services/info.openrocket.core.optimization.services.OptimizableParameterService b/core/src/main/resources/META-INF/services/info.openrocket.core.optimization.services.OptimizableParameterService
deleted file mode 100644
index 93f3e6ef0..000000000
--- a/core/src/main/resources/META-INF/services/info.openrocket.core.optimization.services.OptimizableParameterService
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default service implementation:
-info.openrocket.core.optimization.services.DefaultOptimizableParameterService
diff --git a/core/src/main/resources/META-INF/services/info.openrocket.core.optimization.services.SimulationModifierService b/core/src/main/resources/META-INF/services/info.openrocket.core.optimization.services.SimulationModifierService
deleted file mode 100644
index 463092907..000000000
--- a/core/src/main/resources/META-INF/services/info.openrocket.core.optimization.services.SimulationModifierService
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default service implementation:
-info.openrocket.core.optimization.services.DefaultSimulationModifierService
diff --git a/swing/src/main/java/module-info.java b/swing/src/main/java/module-info.java
index 138084332..b17bae5ba 100644
--- a/swing/src/main/java/module-info.java
+++ b/swing/src/main/java/module-info.java
@@ -29,6 +29,26 @@ open module openrocket.swing {
 	requires ch.qos.logback.classic;
 	requires jakarta.inject;
 
+	// Service providers
+	provides info.openrocket.swing.gui.rocketfigure.RocketComponentShapeService with
+			info.openrocket.swing.gui.rocketfigure.BodyTubeShapes,
+			info.openrocket.swing.gui.rocketfigure.ComponentAssemblyShapes,
+			info.openrocket.swing.gui.rocketfigure.FinSetShapes,
+			info.openrocket.swing.gui.rocketfigure.LaunchLugShapes,
+			info.openrocket.swing.gui.rocketfigure.MassComponentShapes,
+			info.openrocket.swing.gui.rocketfigure.ParachuteShapes,
+			info.openrocket.swing.gui.rocketfigure.ParallelStageShapes,
+			info.openrocket.swing.gui.rocketfigure.PodSetShapes,
+			info.openrocket.swing.gui.rocketfigure.RailButtonShapes,
+			info.openrocket.swing.gui.rocketfigure.RingComponentShapes,
+			info.openrocket.swing.gui.rocketfigure.RocketComponentShapes,
+			info.openrocket.swing.gui.rocketfigure.ShockCordShapes,
+			info.openrocket.swing.gui.rocketfigure.StreamerShapes,
+			info.openrocket.swing.gui.rocketfigure.SymmetricComponentShapes,
+			info.openrocket.swing.gui.rocketfigure.TransitionShapes,
+			info.openrocket.swing.gui.rocketfigure.TubeFinSetShapes,
+			info.openrocket.swing.gui.rocketfigure.TubeShapes;
+
 	/*opens info.openrocket.swing.startup.providers to com.google.guice;
 	opens info.openrocket.swing.startup to com.google.guice;
 	opens info.openrocket.swing.gui.util to com.google.guice;
diff --git a/swing/src/main/resources/META-INF/services/info.openrocket.swing.gui.rocketfigure.RocketComponentShapeService b/swing/src/main/resources/META-INF/services/info.openrocket.swing.gui.rocketfigure.RocketComponentShapeService
deleted file mode 100644
index f06d21616..000000000
--- a/swing/src/main/resources/META-INF/services/info.openrocket.swing.gui.rocketfigure.RocketComponentShapeService
+++ /dev/null
@@ -1,17 +0,0 @@
-info.openrocket.swing.gui.rocketfigure.BodyTubeShapes
-info.openrocket.swing.gui.rocketfigure.ComponentAssemblyShapes
-info.openrocket.swing.gui.rocketfigure.FinSetShapes
-info.openrocket.swing.gui.rocketfigure.LaunchLugShapes
-info.openrocket.swing.gui.rocketfigure.MassComponentShapes
-info.openrocket.swing.gui.rocketfigure.ParachuteShapes
-info.openrocket.swing.gui.rocketfigure.ParallelStageShapes
-info.openrocket.swing.gui.rocketfigure.PodSetShapes
-info.openrocket.swing.gui.rocketfigure.RailButtonShapes
-info.openrocket.swing.gui.rocketfigure.RingComponentShapes
-info.openrocket.swing.gui.rocketfigure.RocketComponentShapes
-info.openrocket.swing.gui.rocketfigure.ShockCordShapes
-info.openrocket.swing.gui.rocketfigure.StreamerShapes
-info.openrocket.swing.gui.rocketfigure.SymmetricComponentShapes
-info.openrocket.swing.gui.rocketfigure.TransitionShapes
-info.openrocket.swing.gui.rocketfigure.TubeFinSetShapes
-info.openrocket.swing.gui.rocketfigure.TubeShapes
\ No newline at end of file