diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
index 175aa55b0e..91f56993cc 100644
--- a/cli/build.gradle.kts
+++ b/cli/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 /** Application */
 
-val mainPackage = "${project.group}.${rootProject.name}"
+val mainPackage = "${project.group}.${rootProject.name}.${project.name}"
 
 application {
     mainClass.set("$mainPackage.MainKt")
diff --git a/cli/src/main/kotlin/edu/cornell/cs/apl/viaduct/Main.kt b/cli/src/main/kotlin/edu/cornell/cs/apl/viaduct/cli/Main.kt
similarity index 92%
rename from cli/src/main/kotlin/edu/cornell/cs/apl/viaduct/Main.kt
rename to cli/src/main/kotlin/edu/cornell/cs/apl/viaduct/cli/Main.kt
index d09cf92f3c..38ed2c026c 100644
--- a/cli/src/main/kotlin/edu/cornell/cs/apl/viaduct/Main.kt
+++ b/cli/src/main/kotlin/edu/cornell/cs/apl/viaduct/cli/Main.kt
@@ -1,8 +1,7 @@
-package edu.cornell.cs.apl.viaduct
+package edu.cornell.cs.apl.viaduct.cli
 
 import edu.cornell.cs.apl.prettyprinting.Document
 import edu.cornell.cs.apl.prettyprinting.plus
-import edu.cornell.cs.apl.viaduct.cli.Viaduct
 import edu.cornell.cs.apl.viaduct.errors.CompilationError
 import org.fusesource.jansi.AnsiConsole
 import java.io.IOException