diff --git a/iocell/src/main/scala/barstools.iocell.chisel/Analog.scala b/iocell/src/main/scala/barstools/iocell/chisel/Analog.scala
similarity index 100%
rename from iocell/src/main/scala/barstools.iocell.chisel/Analog.scala
rename to iocell/src/main/scala/barstools/iocell/chisel/Analog.scala
diff --git a/iocell/src/main/scala/barstools.iocell.chisel/IOCell.scala b/iocell/src/main/scala/barstools/iocell/chisel/IOCell.scala
similarity index 100%
rename from iocell/src/main/scala/barstools.iocell.chisel/IOCell.scala
rename to iocell/src/main/scala/barstools/iocell/chisel/IOCell.scala
diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala
index 6e79b7e5..86bf43de 100644
--- a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala
+++ b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala
@@ -1,8 +1,8 @@
 // See LICENSE for license details.
 
-package barstools.tapeout.transforms
+package barstools.tapeout.transforms.utils
 
-import chisel3.experimental.{annotate, ChiselAnnotation}
+import chisel3.experimental.{ChiselAnnotation, annotate}
 import firrtl._
 import firrtl.annotations._
 import firrtl.stage.Forms
diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala
index 1f628900..45502d6d 100644
--- a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala
+++ b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala
@@ -1,4 +1,4 @@
-package barstools.tapeout.transforms
+package barstools.tapeout.transforms.utils
 
 object LowerName {
   def apply(s: String): String = s.replace(".", "_").replace("[", "_").replace("]", "")
diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala
index 8025439c..66200e61 100644
--- a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala
+++ b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala
@@ -1,6 +1,7 @@
-package barstools.tapeout.transforms
+package barstools.tapeout.transforms.utils
 
 import chisel3._
+
 import scala.collection.immutable.ListMap
 
 class CustomBundle[T <: Data](elts: (String, T)*) extends Record {
diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala
index 75b0c330..9a226de5 100644
--- a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala
+++ b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala
@@ -1,6 +1,7 @@
-package barstools.tapeout.transforms
+package barstools.tapeout.transforms.utils
 
 import net.jcazevedo.moultingyaml._
+
 import java.io.File
 
 class YamlFileReader(resource: String) {