diff --git a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala
index 13acce2..cf169af 100644
--- a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala
+++ b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala
@@ -1,10 +1,11 @@
 package com.htmlism.firepower.demo
 
+import com.htmlism.firepower.demo.asm._
+import com.htmlism.firepower.demo.str._
 import zio.*
 
 import java.io.IOException
-
-import com.htmlism.rufio.withzio._
+import com.htmlism.rufio.withzio.*
 
 object PrintPrograms extends ZIOAppDefault:
   private def writeLine(file: String)(s: String) =
diff --git a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/CommentBlock.scala b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/asm/CommentBlock.scala
similarity index 72%
rename from firepower-demo/src/main/scala/com/htmlism/firepower/demo/CommentBlock.scala
rename to firepower-demo/src/main/scala/com/htmlism/firepower/demo/asm/CommentBlock.scala
index bf712da..ff30355 100644
--- a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/CommentBlock.scala
+++ b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/asm/CommentBlock.scala
@@ -1,4 +1,6 @@
-package com.htmlism.firepower.demo
+package com.htmlism.firepower.demo.asm
+
+import com.htmlism.firepower.demo.str.Paragraph
 
 case class CommentBlock(xs: List[String])
 
diff --git a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/Line.scala b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/str/Line.scala
similarity index 68%
rename from firepower-demo/src/main/scala/com/htmlism/firepower/demo/Line.scala
rename to firepower-demo/src/main/scala/com/htmlism/firepower/demo/str/Line.scala
index 160c1cd..4b9bafb 100644
--- a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/Line.scala
+++ b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/str/Line.scala
@@ -1,4 +1,4 @@
-package com.htmlism.firepower.demo
+package com.htmlism.firepower.demo.str
 
 object Line:
   def mkString(xs: List[String]): String =
diff --git a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/Paragraph.scala b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/str/Paragraph.scala
similarity index 93%
rename from firepower-demo/src/main/scala/com/htmlism/firepower/demo/Paragraph.scala
rename to firepower-demo/src/main/scala/com/htmlism/firepower/demo/str/Paragraph.scala
index 361c084..8ed121d 100644
--- a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/Paragraph.scala
+++ b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/str/Paragraph.scala
@@ -1,4 +1,4 @@
-package com.htmlism.firepower.demo
+package com.htmlism.firepower.demo.str
 
 /**
   * An abstraction for groups of lines that are eventually separated by newlines, but between paragraphs there's an