diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/ProjectParser.java b/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/ProjectParser.java
index aefa949..4f1a057 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/ProjectParser.java
+++ b/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/main/java/org/springframework/rewrite/gradle/ProjectParser.java
@@ -20,9 +20,6 @@ import org.openrewrite.InMemoryExecutionContext;
 import org.openrewrite.SourceFile;
 import org.openrewrite.gradle.GradleParser;
 import org.openrewrite.gradle.toolingapi.GradleSettings;
-import org.springframework.rewrite.gradle.model.GradleProjectData;
-import org.springframework.rewrite.gradle.model.JavaSourceSetData;
-import org.springframework.rewrite.gradle.model.KotlinSourceSetData;
 import org.openrewrite.groovy.GroovyParser;
 import org.openrewrite.internal.StringUtils;
 import org.openrewrite.internal.lang.Nullable;
@@ -40,8 +37,13 @@ import org.openrewrite.style.NamedStyles;
 import org.openrewrite.text.PlainTextParser;
 import org.openrewrite.tree.ParseError;
 import org.slf4j.Logger;
+import org.springframework.rewrite.gradle.model.GradleProjectData;
+import org.springframework.rewrite.gradle.model.JavaSourceSetData;
+import org.springframework.rewrite.gradle.model.KotlinSourceSetData;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
@@ -52,8 +54,9 @@ import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 
-import static java.util.Collections.*;
-import static java.util.stream.Collectors.*;
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
+import static java.util.stream.Collectors.toList;
 import static org.openrewrite.PathUtils.separatorsToUnix;
 import static org.openrewrite.Tree.randomId;
 
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/ProjectParserTest.java b/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/ProjectParserTest.java
index dcd3ef3..2ae2b34 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/ProjectParserTest.java
+++ b/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/ProjectParserTest.java
@@ -21,24 +21,17 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.openrewrite.InMemoryExecutionContext;
 import org.openrewrite.SourceFile;
-import org.openrewrite.style.NamedStyles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.rewrite.gradle.model.GradleProjectData;
 import org.springframework.rewrite.gradle.model.SpringRewriteModelBuilder;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -113,6 +106,7 @@ public class ProjectParserTest {
 		assertThat(modelProject.getName()).isEqualTo("model");
 		assertThat(modelProject.getVersion()).isEqualTo("unspecified");
 		assertThat(modelProject.getMavenRepositories().size()).isEqualTo(3);
+		assertThat(modelProject.getRootProjectDir().toPath().relativize(modelProject.getProjectDir().toPath()).toString()).isEqualTo("model");
 
 		GradleProjectData pluginProject = itr.next();
 		assertThat(pluginProject.isRootProject()).isFalse();
@@ -120,6 +114,7 @@ public class ProjectParserTest {
 		assertThat(pluginProject.getName()).isEqualTo("plugin");
 		assertThat(pluginProject.getVersion()).isEqualTo("unspecified");
 		assertThat(pluginProject.getMavenRepositories().size()).isEqualTo(3);
+		assertThat(modelProject.getRootProjectDir().toPath().relativize(pluginProject.getProjectDir().toPath()).toString()).isEqualTo("plugin");
 	}
 
 	@Test
@@ -133,7 +128,7 @@ public class ProjectParserTest {
 		assertThat(gp.getVersion()).isEqualTo("unspecified");
 		assertThat(gp.getMavenRepositories().size()).isEqualTo(3);
 		assertThat(gp.getSubprojects().isEmpty()).isTrue();
-		assertThat(gp.getRootProjectDir().toPath().toString().endsWith(rewriteGradleModelPath.toString())).isTrue();
+		assertThat(gp.getRootProjectDir().toPath().relativize(gp.getProjectDir().toPath()).toString()).isEqualTo("model");
 	}
 
 	@Test
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/model/GradleProjectDataTest.java b/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/model/GradleProjectDataTest.java
index df4942a..3778f97 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/model/GradleProjectDataTest.java
+++ b/spring-rewrite-commons-gradle/rewrite-gradle-parser/src/test/java/org/springframework/rewrite/gradle/model/GradleProjectDataTest.java
@@ -17,13 +17,10 @@ package org.springframework.rewrite.gradle.model;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.springframework.rewrite.gradle.Utils;
 
 import java.io.InputStream;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Iterator;
 import java.util.Objects;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiProjectBuilder.java b/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiProjectBuilder.java
index 0328b9e..e80ebe2 100644
--- a/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiProjectBuilder.java
+++ b/spring-rewrite-commons-gradle/rewrite-gradle-plugin/src/main/java/org/springframework/rewrite/gradle/plugin/model/GradleToolingApiProjectBuilder.java
@@ -15,7 +15,10 @@
  */
 package org.springframework.rewrite.gradle.plugin.model;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;