diff --git a/README.md b/README.md
index 70cf9642..18310843 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ feature or via instrumentation, this project is hopefully for you.
 * [JFR Streaming](./jfr-streaming/README.md)
 * [JMX Metric Gatherer](./jmx-metrics/README.md)
 * [OpenTelemetry Maven Extension](./maven-extension/README.md)
-* [Runtime Attach](./runtime-attach/README.md)
+* [Runtime Attach](./runtime-attach/runtime-attach/README.md)
 * [Samplers](./samplers/README.md)
 
 ## Getting Started
diff --git a/runtime-attach-core/README.md b/runtime-attach/runtime-attach-core/README.md
similarity index 100%
rename from runtime-attach-core/README.md
rename to runtime-attach/runtime-attach-core/README.md
diff --git a/runtime-attach-core/build.gradle.kts b/runtime-attach/runtime-attach-core/build.gradle.kts
similarity index 100%
rename from runtime-attach-core/build.gradle.kts
rename to runtime-attach/runtime-attach-core/build.gradle.kts
diff --git a/runtime-attach-core/src/main/java/io/opentelemetry/contrib/attach/AgentFileProvider.java b/runtime-attach/runtime-attach-core/src/main/java/io/opentelemetry/contrib/attach/AgentFileProvider.java
similarity index 100%
rename from runtime-attach-core/src/main/java/io/opentelemetry/contrib/attach/AgentFileProvider.java
rename to runtime-attach/runtime-attach-core/src/main/java/io/opentelemetry/contrib/attach/AgentFileProvider.java
diff --git a/runtime-attach-core/src/main/java/io/opentelemetry/contrib/attach/CoreRuntimeAttach.java b/runtime-attach/runtime-attach-core/src/main/java/io/opentelemetry/contrib/attach/CoreRuntimeAttach.java
similarity index 100%
rename from runtime-attach-core/src/main/java/io/opentelemetry/contrib/attach/CoreRuntimeAttach.java
rename to runtime-attach/runtime-attach-core/src/main/java/io/opentelemetry/contrib/attach/CoreRuntimeAttach.java
diff --git a/runtime-attach/README.md b/runtime-attach/runtime-attach/README.md
similarity index 97%
rename from runtime-attach/README.md
rename to runtime-attach/runtime-attach/README.md
index 32467052..8359bf17 100644
--- a/runtime-attach/README.md
+++ b/runtime-attach/runtime-attach/README.md
@@ -30,4 +30,4 @@ public class SpringBootApp {
 - [Nikita Salnikov-Tarnovski](https://github.com/iNikem), Splunk
 - [Trask Stalnaker](https://github.com/trask), Microsoft
 
-Learn more about component owners in [component_owners.yml](../.github/component_owners.yml).
+Learn more about component owners in [component_owners.yml](../../.github/component_owners.yml).
diff --git a/runtime-attach/build.gradle.kts b/runtime-attach/runtime-attach/build.gradle.kts
similarity index 94%
rename from runtime-attach/build.gradle.kts
rename to runtime-attach/runtime-attach/build.gradle.kts
index 3d883d9a..9736d83c 100644
--- a/runtime-attach/build.gradle.kts
+++ b/runtime-attach/runtime-attach/build.gradle.kts
@@ -8,7 +8,7 @@ description = "To runtime attach the OpenTelemetry Java Instrumentation agent"
 val agent: Configuration by configurations.creating
 
 dependencies {
-  implementation(project(":runtime-attach-core"))
+  implementation(project(":runtime-attach:runtime-attach-core"))
   agent("io.opentelemetry.javaagent:opentelemetry-javaagent:1.15.0")
 
   // Used by byte-buddy but not brought in as a transitive dependency.
diff --git a/runtime-attach/src/main/java/io/opentelemetry/contrib/attach/RuntimeAttach.java b/runtime-attach/runtime-attach/src/main/java/io/opentelemetry/contrib/attach/RuntimeAttach.java
similarity index 100%
rename from runtime-attach/src/main/java/io/opentelemetry/contrib/attach/RuntimeAttach.java
rename to runtime-attach/runtime-attach/src/main/java/io/opentelemetry/contrib/attach/RuntimeAttach.java
diff --git a/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AbstractAttachmentTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AbstractAttachmentTest.java
similarity index 100%
rename from runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AbstractAttachmentTest.java
rename to runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AbstractAttachmentTest.java
diff --git a/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java
similarity index 100%
rename from runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java
rename to runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/AgentDisabledTest.java
diff --git a/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java b/runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java
similarity index 100%
rename from runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java
rename to runtime-attach/runtime-attach/src/test/java/io/opentelemetry/contrib/attach/RunTimeAttachBasicTest.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a0144715..dd2dabc5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,8 +46,8 @@ include(":jfr-streaming")
 include(":micrometer-meter-provider")
 include(":jmx-metrics")
 include(":maven-extension")
-include(":runtime-attach")
-include(":runtime-attach-core")
+include(":runtime-attach:runtime-attach")
+include(":runtime-attach:runtime-attach-core")
 include(":samplers")
 include(":static-instrumenter:agent-instrumenter")
 include(":static-instrumenter:gradle-plugin")