diff --git a/opendc-experiments/opendc-experiments-m3sa/build.gradle.kts b/opendc-experiments/opendc-experiments-m3sa/build.gradle.kts
index 6530390b5..9347e5251 100644
--- a/opendc-experiments/opendc-experiments-m3sa/build.gradle.kts
+++ b/opendc-experiments/opendc-experiments-m3sa/build.gradle.kts
@@ -31,7 +31,6 @@ dependencies {
     api(libs.kotlinx.coroutines)
 
     testImplementation(projects.opendcSimulator.opendcSimulatorCore)
-    api(projects.opendcCompute.opendcComputeService)
     api(projects.opendcCompute.opendcComputeSimulator)
 
     implementation(libs.clikt)
@@ -42,7 +41,6 @@ dependencies {
     implementation(project(mapOf("path" to ":opendc-simulator:opendc-simulator-core")))
 
     implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-workload")))
-    implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-telemetry")))
     implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-topology")))
     implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-carbon")))
     implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-failure")))
diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt
similarity index 98%
rename from opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt
rename to opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt
index 6b8f8422b..545ed656b 100644
--- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt
+++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt
@@ -20,6 +20,8 @@
  * SOFTWARE.
  */
 
+package org.opendc.experiments.m3sa
+
 import kotlin.io.path.Path
 
 /**
diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt
index 43597ff5c..8036e5b72 100644
--- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt
+++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt
@@ -22,7 +22,7 @@
 
 @file:JvmName("M3SACli")
 
-package org.opendc.experiments.base.runner
+package org.opendc.experiments.m3sa.runner
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.default
@@ -30,8 +30,9 @@ import com.github.ajalt.clikt.parameters.options.defaultLazy
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.file
 import com.github.ajalt.clikt.parameters.types.int
-import m3saAnalyze
+import org.opendc.experiments.base.runner.runExperiment
 import org.opendc.experiments.base.scenario.getExperiment
+import org.opendc.experiments.m3sa.m3saAnalyze
 import org.opendc.experiments.m3sa.scenario.getOutputFolder
 import java.io.File
 
diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt
index 9a61ad175..89daf5f36 100644
--- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt
+++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt
@@ -22,8 +22,10 @@
 
 @file:JvmName("M3saCliKt")
 
-package org.opendc.experiments.base.runner
+package org.opendc.experiments.m3sa.runner
 
+import org.opendc.experiments.base.runner.runScenario
+import org.opendc.experiments.base.runner.setupOutputFolderStructure
 import org.opendc.experiments.base.scenario.Scenario
 import java.util.concurrent.ForkJoinPool
 
diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/scenario/M3SAFactories.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/scenario/M3SAFactories.kt
new file mode 100644
index 000000000..a4df40e1f
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/scenario/M3SAFactories.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 AtLarge Research
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.opendc.experiments.m3sa.scenario
+
+import org.opendc.experiments.base.scenario.ExperimentReader
+import java.io.File
+
+private val experimentReader = ExperimentReader()
+
+/**
+ * Returns a list of Scenarios from a given file path (input).
+ *
+ * @param filePath The path to the file containing the scenario specifications.
+ * @return A list of Scenarios.
+ */
+public fun getOutputFolder(file: File): String {
+    return experimentReader.read(file).outputFolder + "/outputs"
+}