diff --git a/cmd/terraform-j2md/main.go b/cmd/terraform-j2md/main.go
index 3f8deae..20be2ef 100644
--- a/cmd/terraform-j2md/main.go
+++ b/cmd/terraform-j2md/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/reproio/terraform-j2md/internal/terraform"
+	"github.com/reproio/terraform-j2md/pkg/terraform"
 )
 
 var (
diff --git a/internal/terraform/moved_block_renderer.go b/internal/render/moved_block_renderer.go
similarity index 98%
rename from internal/terraform/moved_block_renderer.go
rename to internal/render/moved_block_renderer.go
index 8c9b57f..10cff27 100644
--- a/internal/terraform/moved_block_renderer.go
+++ b/internal/render/moved_block_renderer.go
@@ -1,4 +1,4 @@
-package terraform
+package render
 
 import (
 	"bytes"
diff --git a/internal/terraform/unified_diff_renderer.go b/internal/render/unified_diff_renderer.go
similarity index 99%
rename from internal/terraform/unified_diff_renderer.go
rename to internal/render/unified_diff_renderer.go
index 293511c..766a76c 100644
--- a/internal/terraform/unified_diff_renderer.go
+++ b/internal/render/unified_diff_renderer.go
@@ -1,4 +1,4 @@
-package terraform
+package render
 
 import (
 	"bytes"
diff --git a/internal/terraform/plan.go b/pkg/terraform/terraform.go
similarity index 94%
rename from internal/terraform/plan.go
rename to pkg/terraform/terraform.go
index 2a500f6..86b7dba 100644
--- a/internal/terraform/plan.go
+++ b/pkg/terraform/terraform.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/hashicorp/terraform-json/sanitize"
 	"github.com/reproio/terraform-j2md/internal/format"
+	"github.com/reproio/terraform-j2md/internal/render"
 	"io"
 	"text/template"
 
@@ -80,7 +81,7 @@ func (plan *PlanData) Render(w io.Writer) error {
 		return fmt.Errorf("invalid template text: %w", err)
 	}
 
-	if err := planTemplate.Execute(w, plan); err != nil {
+	if err = planTemplate.Execute(w, plan); err != nil {
 		return fmt.Errorf("failed to render template: %w", err)
 	}
 	return nil
@@ -127,7 +128,7 @@ func NewPlanData(input io.Reader, escapeHTML bool) (*PlanData, error) {
 			planData.MovedAddresses = append(planData.MovedAddresses, fmt.Sprintf("%s (from %s)", c.Address, c.PreviousAddress))
 			planData.ResourceChanges = append(planData.ResourceChanges, ResourceChangeData{
 				ResourceChange: c,
-				Renderer:       NewMovedBlockRenderer(c),
+				Renderer:       render.NewMovedBlockRenderer(c),
 			})
 			continue
 		}
@@ -148,7 +149,7 @@ func NewPlanData(input io.Reader, escapeHTML bool) (*PlanData, error) {
 		}
 		planData.ResourceChanges = append(planData.ResourceChanges, ResourceChangeData{
 			ResourceChange: c,
-			Renderer:       NewUnifiedDiffRenderer(c, escapeHTML),
+			Renderer:       render.NewUnifiedDiffRenderer(c, escapeHTML),
 		})
 	}
 	return &planData, nil
diff --git a/test/plan_test/plan_test.go b/test/plan_test/plan_test.go
index e937b66..b611005 100644
--- a/test/plan_test/plan_test.go
+++ b/test/plan_test/plan_test.go
@@ -3,7 +3,7 @@ package plan_test
 import (
 	"bytes"
 	"fmt"
-	"github.com/reproio/terraform-j2md/internal/terraform"
+	"github.com/reproio/terraform-j2md/pkg/terraform"
 	"os"
 	"testing"
 )