diff --git a/src/main/scala/mdf/macrolib/ConfReader.scala b/tools/tapeout/src/main/scala/macrolib/ConfReader.scala
similarity index 100%
rename from src/main/scala/mdf/macrolib/ConfReader.scala
rename to tools/tapeout/src/main/scala/macrolib/ConfReader.scala
diff --git a/src/main/scala/mdf/macrolib/FillerMacroBase.scala b/tools/tapeout/src/main/scala/macrolib/FillerMacroBase.scala
similarity index 100%
rename from src/main/scala/mdf/macrolib/FillerMacroBase.scala
rename to tools/tapeout/src/main/scala/macrolib/FillerMacroBase.scala
diff --git a/src/main/scala/mdf/macrolib/FlipChipMacro.scala b/tools/tapeout/src/main/scala/macrolib/FlipChipMacro.scala
similarity index 100%
rename from src/main/scala/mdf/macrolib/FlipChipMacro.scala
rename to tools/tapeout/src/main/scala/macrolib/FlipChipMacro.scala
diff --git a/src/main/scala/mdf/macrolib/IOMacro.scala b/tools/tapeout/src/main/scala/macrolib/IOMacro.scala
similarity index 100%
rename from src/main/scala/mdf/macrolib/IOMacro.scala
rename to tools/tapeout/src/main/scala/macrolib/IOMacro.scala
diff --git a/src/main/scala/mdf/macrolib/MacroLib.scala b/tools/tapeout/src/main/scala/macrolib/MacroLib.scala
similarity index 100%
rename from src/main/scala/mdf/macrolib/MacroLib.scala
rename to tools/tapeout/src/main/scala/macrolib/MacroLib.scala
diff --git a/src/main/scala/mdf/macrolib/SRAM.scala b/tools/tapeout/src/main/scala/macrolib/SRAM.scala
similarity index 100%
rename from src/main/scala/mdf/macrolib/SRAM.scala
rename to tools/tapeout/src/main/scala/macrolib/SRAM.scala
diff --git a/src/main/scala/mdf/macrolib/Utils.scala b/tools/tapeout/src/main/scala/macrolib/Utils.scala
similarity index 100%
rename from src/main/scala/mdf/macrolib/Utils.scala
rename to tools/tapeout/src/main/scala/macrolib/Utils.scala
diff --git a/src/main/scala/barstools/macros/CostMetric.scala b/tools/tapeout/src/main/scala/macros/CostMetric.scala
similarity index 100%
rename from src/main/scala/barstools/macros/CostMetric.scala
rename to tools/tapeout/src/main/scala/macros/CostMetric.scala
diff --git a/src/main/scala/barstools/macros/MacroCompiler.scala b/tools/tapeout/src/main/scala/macros/MacroCompiler.scala
similarity index 100%
rename from src/main/scala/barstools/macros/MacroCompiler.scala
rename to tools/tapeout/src/main/scala/macros/MacroCompiler.scala
diff --git a/src/main/scala/barstools/macros/SynFlopsPass.scala b/tools/tapeout/src/main/scala/macros/SynFlopsPass.scala
similarity index 100%
rename from src/main/scala/barstools/macros/SynFlopsPass.scala
rename to tools/tapeout/src/main/scala/macros/SynFlopsPass.scala
diff --git a/src/main/scala/barstools/macros/Utils.scala b/tools/tapeout/src/main/scala/macros/Utils.scala
similarity index 100%
rename from src/main/scala/barstools/macros/Utils.scala
rename to tools/tapeout/src/main/scala/macros/Utils.scala
diff --git a/src/main/scala/barstools/tapeout/transforms/ExtraTransforms.scala b/tools/tapeout/src/main/scala/transforms/ExtraTransforms.scala
similarity index 100%
rename from src/main/scala/barstools/tapeout/transforms/ExtraTransforms.scala
rename to tools/tapeout/src/main/scala/transforms/ExtraTransforms.scala
diff --git a/src/main/scala/barstools/tapeout/transforms/GenerateModelStageMain.scala b/tools/tapeout/src/main/scala/transforms/GenerateModelStageMain.scala
similarity index 100%
rename from src/main/scala/barstools/tapeout/transforms/GenerateModelStageMain.scala
rename to tools/tapeout/src/main/scala/transforms/GenerateModelStageMain.scala
diff --git a/src/main/scala/barstools/tapeout/transforms/retime/Retime.scala b/tools/tapeout/src/main/scala/transforms/retime/Retime.scala
similarity index 100%
rename from src/main/scala/barstools/tapeout/transforms/retime/Retime.scala
rename to tools/tapeout/src/main/scala/transforms/retime/Retime.scala
diff --git a/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala b/tools/tapeout/src/main/scala/transforms/stage/TapeoutStage.scala
similarity index 100%
rename from src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala
rename to tools/tapeout/src/main/scala/transforms/stage/TapeoutStage.scala
diff --git a/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala b/tools/tapeout/src/main/scala/transforms/utils/FileUtils.scala
similarity index 100%
rename from src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala
rename to tools/tapeout/src/main/scala/transforms/utils/FileUtils.scala
diff --git a/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala b/tools/tapeout/src/main/scala/transforms/utils/LowerAnnotations.scala
similarity index 100%
rename from src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala
rename to tools/tapeout/src/main/scala/transforms/utils/LowerAnnotations.scala
diff --git a/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala b/tools/tapeout/src/main/scala/transforms/utils/ProgrammaticBundle.scala
similarity index 100%
rename from src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala
rename to tools/tapeout/src/main/scala/transforms/utils/ProgrammaticBundle.scala
diff --git a/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala b/tools/tapeout/src/main/scala/transforms/utils/YamlHelpers.scala
similarity index 100%
rename from src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala
rename to tools/tapeout/src/main/scala/transforms/utils/YamlHelpers.scala