diff --git a/ion-java-cli/build.gradle.kts b/ion-java-cli/build.gradle.kts
index 288e8b3697..8ddd311a4e 100644
--- a/ion-java-cli/build.gradle.kts
+++ b/ion-java-cli/build.gradle.kts
@@ -17,12 +17,6 @@ dependencies {
     implementation(rootProject)
 }
 
-sourceSets {
-    main {
-        java.srcDir("src")
-    }
-}
-
 application {
     mainClass.set("com.amazon.tools.cli.IonJavaCli")
 }
diff --git a/ion-java-cli/src/com/amazon/tools/cli/CommandType.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/CommandType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/CommandType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/CommandType.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/CompareContext.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/CompareContext.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/CompareContext.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/CompareContext.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/ComparisonType.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/ComparisonType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/ComparisonType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/ComparisonType.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/IonJavaCli.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/IonJavaCli.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/NoCloseOutputStream.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/NoCloseOutputStream.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/NoCloseOutputStream.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/NoCloseOutputStream.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/NoOpOutputStream.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/NoOpOutputStream.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/NoOpOutputStream.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/NoOpOutputStream.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/OutputFormat.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/OutputFormat.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/ProcessContext.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/ProcessContext.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/ProcessContext.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/ProcessContext.java
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonContext.java b/ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonContext.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonContext.java
rename to ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonContext.java
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResult.java b/ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonResult.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResult.java
rename to ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonResult.java
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResultType.java b/ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonResultType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResultType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonResultType.java
diff --git a/ion-java-cli/src/com/amazon/tools/errorReport/ErrorDescription.java b/ion-java-cli/src/main/java/com/amazon/tools/errorReport/ErrorDescription.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/errorReport/ErrorDescription.java
rename to ion-java-cli/src/main/java/com/amazon/tools/errorReport/ErrorDescription.java
diff --git a/ion-java-cli/src/com/amazon/tools/errorReport/ErrorType.java b/ion-java-cli/src/main/java/com/amazon/tools/errorReport/ErrorType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/errorReport/ErrorType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/errorReport/ErrorType.java
diff --git a/ion-java-cli/src/com/amazon/tools/events/Event.java b/ion-java-cli/src/main/java/com/amazon/tools/events/Event.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/events/Event.java
rename to ion-java-cli/src/main/java/com/amazon/tools/events/Event.java
diff --git a/ion-java-cli/src/com/amazon/tools/events/EventType.java b/ion-java-cli/src/main/java/com/amazon/tools/events/EventType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/events/EventType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/events/EventType.java
diff --git a/ion-java-cli/src/com/amazon/tools/events/ImportDescriptor.java b/ion-java-cli/src/main/java/com/amazon/tools/events/ImportDescriptor.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/events/ImportDescriptor.java
rename to ion-java-cli/src/main/java/com/amazon/tools/events/ImportDescriptor.java