diff --git a/build.sbt b/build.sbt
index c2ed80808a..07c5296977 100644
--- a/build.sbt
+++ b/build.sbt
@@ -168,7 +168,8 @@ lazy val chipyard = (project in file("generators/chipyard"))
       "org.reflections" % "reflections" % "0.10.2"
     )
   )
- .settings(commonSettings)
+  .settings(commonSettings)
+  .settings(Compile / unmanagedSourceDirectories += file("tools/stage-chisel3/src/main/scala"))
 
 lazy val barf = (project in file("generators/bar-fetchers"))
   .dependsOn(rocketchip)
diff --git a/generators/chipyard/src/main/scala/stage/ChipyardAnnotations.scala b/tools/stage-chisel3/src/main/scala/ChipyardAnnotations.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/ChipyardAnnotations.scala
rename to tools/stage-chisel3/src/main/scala/ChipyardAnnotations.scala
diff --git a/generators/chipyard/src/main/scala/stage/ChipyardCli.scala b/tools/stage-chisel3/src/main/scala/ChipyardCli.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/ChipyardCli.scala
rename to tools/stage-chisel3/src/main/scala/ChipyardCli.scala
diff --git a/generators/chipyard/src/main/scala/stage/ChipyardOptions.scala b/tools/stage-chisel3/src/main/scala/ChipyardOptions.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/ChipyardOptions.scala
rename to tools/stage-chisel3/src/main/scala/ChipyardOptions.scala
diff --git a/generators/chipyard/src/main/scala/stage/ChipyardStage.scala b/tools/stage-chisel3/src/main/scala/ChipyardStage.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/ChipyardStage.scala
rename to tools/stage-chisel3/src/main/scala/ChipyardStage.scala
diff --git a/generators/chipyard/src/main/scala/stage/StageUtils.scala b/tools/stage-chisel3/src/main/scala/StageUtils.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/StageUtils.scala
rename to tools/stage-chisel3/src/main/scala/StageUtils.scala
diff --git a/generators/chipyard/src/main/scala/stage/package.scala b/tools/stage-chisel3/src/main/scala/package.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/package.scala
rename to tools/stage-chisel3/src/main/scala/package.scala
diff --git a/generators/chipyard/src/main/scala/stage/phases/AddDefaultTests.scala b/tools/stage-chisel3/src/main/scala/phases/AddDefaultTests.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/phases/AddDefaultTests.scala
rename to tools/stage-chisel3/src/main/scala/phases/AddDefaultTests.scala
diff --git a/generators/chipyard/src/main/scala/stage/phases/Checks.scala b/tools/stage-chisel3/src/main/scala/phases/Checks.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/phases/Checks.scala
rename to tools/stage-chisel3/src/main/scala/phases/Checks.scala
diff --git a/generators/chipyard/src/main/scala/stage/phases/GenerateArtefacts.scala b/tools/stage-chisel3/src/main/scala/phases/GenerateArtefacts.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/phases/GenerateArtefacts.scala
rename to tools/stage-chisel3/src/main/scala/phases/GenerateArtefacts.scala
diff --git a/generators/chipyard/src/main/scala/stage/phases/GenerateFirrtlAnnos.scala b/tools/stage-chisel3/src/main/scala/phases/GenerateFirrtlAnnos.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/phases/GenerateFirrtlAnnos.scala
rename to tools/stage-chisel3/src/main/scala/phases/GenerateFirrtlAnnos.scala
diff --git a/generators/chipyard/src/main/scala/stage/phases/GenerateTestSuiteMakefrags.scala b/tools/stage-chisel3/src/main/scala/phases/GenerateTestSuiteMakefrags.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/phases/GenerateTestSuiteMakefrags.scala
rename to tools/stage-chisel3/src/main/scala/phases/GenerateTestSuiteMakefrags.scala
diff --git a/generators/chipyard/src/main/scala/stage/phases/PreElaboration.scala b/tools/stage-chisel3/src/main/scala/phases/PreElaboration.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/phases/PreElaboration.scala
rename to tools/stage-chisel3/src/main/scala/phases/PreElaboration.scala
diff --git a/generators/chipyard/src/main/scala/stage/phases/TransformAnnotations.scala b/tools/stage-chisel3/src/main/scala/phases/TransformAnnotations.scala
similarity index 100%
rename from generators/chipyard/src/main/scala/stage/phases/TransformAnnotations.scala
rename to tools/stage-chisel3/src/main/scala/phases/TransformAnnotations.scala