diff --git a/uncore/src/main/scala/tilelink2/Buffer.scala b/src/main/scala/uncore/tilelink2/Buffer.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Buffer.scala
rename to src/main/scala/uncore/tilelink2/Buffer.scala
diff --git a/uncore/src/main/scala/tilelink2/Bundles.scala b/src/main/scala/uncore/tilelink2/Bundles.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Bundles.scala
rename to src/main/scala/uncore/tilelink2/Bundles.scala
diff --git a/uncore/src/main/scala/tilelink2/Edges.scala b/src/main/scala/uncore/tilelink2/Edges.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Edges.scala
rename to src/main/scala/uncore/tilelink2/Edges.scala
diff --git a/uncore/src/main/scala/tilelink2/Fragmenter.scala b/src/main/scala/uncore/tilelink2/Fragmenter.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Fragmenter.scala
rename to src/main/scala/uncore/tilelink2/Fragmenter.scala
diff --git a/uncore/src/main/scala/tilelink2/GPIO.scala b/src/main/scala/uncore/tilelink2/GPIO.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/GPIO.scala
rename to src/main/scala/uncore/tilelink2/GPIO.scala
diff --git a/uncore/src/main/scala/tilelink2/HintHandler.scala b/src/main/scala/uncore/tilelink2/HintHandler.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/HintHandler.scala
rename to src/main/scala/uncore/tilelink2/HintHandler.scala
diff --git a/uncore/src/main/scala/tilelink2/LazyModule.scala b/src/main/scala/uncore/tilelink2/LazyModule.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/LazyModule.scala
rename to src/main/scala/uncore/tilelink2/LazyModule.scala
diff --git a/uncore/src/main/scala/tilelink2/Legacy.scala b/src/main/scala/uncore/tilelink2/Legacy.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Legacy.scala
rename to src/main/scala/uncore/tilelink2/Legacy.scala
diff --git a/uncore/src/main/scala/tilelink2/Monitor.scala b/src/main/scala/uncore/tilelink2/Monitor.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Monitor.scala
rename to src/main/scala/uncore/tilelink2/Monitor.scala
diff --git a/uncore/src/main/scala/tilelink2/Narrower.scala b/src/main/scala/uncore/tilelink2/Narrower.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Narrower.scala
rename to src/main/scala/uncore/tilelink2/Narrower.scala
diff --git a/uncore/src/main/scala/tilelink2/Nodes.scala b/src/main/scala/uncore/tilelink2/Nodes.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Nodes.scala
rename to src/main/scala/uncore/tilelink2/Nodes.scala
diff --git a/uncore/src/main/scala/tilelink2/Parameters.scala b/src/main/scala/uncore/tilelink2/Parameters.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Parameters.scala
rename to src/main/scala/uncore/tilelink2/Parameters.scala
diff --git a/uncore/src/main/scala/tilelink2/RegField.scala b/src/main/scala/uncore/tilelink2/RegField.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/RegField.scala
rename to src/main/scala/uncore/tilelink2/RegField.scala
diff --git a/uncore/src/main/scala/tilelink2/RegMapper.scala b/src/main/scala/uncore/tilelink2/RegMapper.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/RegMapper.scala
rename to src/main/scala/uncore/tilelink2/RegMapper.scala
diff --git a/uncore/src/main/scala/tilelink2/RegisterRouter.scala b/src/main/scala/uncore/tilelink2/RegisterRouter.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/RegisterRouter.scala
rename to src/main/scala/uncore/tilelink2/RegisterRouter.scala
diff --git a/uncore/src/main/scala/tilelink2/SRAM.scala b/src/main/scala/uncore/tilelink2/SRAM.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/SRAM.scala
rename to src/main/scala/uncore/tilelink2/SRAM.scala
diff --git a/uncore/src/main/scala/tilelink2/TLNodes.scala b/src/main/scala/uncore/tilelink2/TLNodes.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/TLNodes.scala
rename to src/main/scala/uncore/tilelink2/TLNodes.scala
diff --git a/uncore/src/main/scala/tilelink2/Xbar.scala b/src/main/scala/uncore/tilelink2/Xbar.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/Xbar.scala
rename to src/main/scala/uncore/tilelink2/Xbar.scala
diff --git a/uncore/src/main/scala/tilelink2/package.scala b/src/main/scala/uncore/tilelink2/package.scala
similarity index 100%
rename from uncore/src/main/scala/tilelink2/package.scala
rename to src/main/scala/uncore/tilelink2/package.scala