diff --git a/hclfmt.go b/fmt/fmt.go
similarity index 100%
rename from hclfmt.go
rename to fmt/fmt.go
diff --git a/hclprinter/hclprinter.go b/printer/printer.go
similarity index 99%
rename from hclprinter/hclprinter.go
rename to printer/printer.go
index ffe1777..a888ce7 100644
--- a/hclprinter/hclprinter.go
+++ b/printer/printer.go
@@ -1,4 +1,4 @@
-package hclprinter
+package printer
 
 import (
 	"bytes"
diff --git a/hclprinter/hclprinter_test.go b/printer/printer_test.go
similarity index 98%
rename from hclprinter/hclprinter_test.go
rename to printer/printer_test.go
index 64c8a1b..77c3913 100644
--- a/hclprinter/hclprinter_test.go
+++ b/printer/printer_test.go
@@ -1,4 +1,4 @@
-package hclprinter
+package printer
 
 import (
 	"os"