Unfold the "hcl" directory up into the root

The main HCL package is more visible this way, and so it's easier than
having to pick it out from dozens of other package directories.

16 files changed, 24 insertions, 24 deletions

diff --git a/hclwrite/ast_attribute.go b/hclwrite/ast_attribute.go
index 677179c..609419f 100644
--- a/hclwrite/ast_attribute.go
+++ b/hclwrite/ast_attribute.go
@@ -1,7 +1,7 @@
 package hclwrite
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 )
 
 type Attribute struct {
diff --git a/hclwrite/ast_block.go b/hclwrite/ast_block.go
index b546de2..fadb2bb 100644
--- a/hclwrite/ast_block.go
+++ b/hclwrite/ast_block.go
@@ -1,7 +1,7 @@
 package hclwrite
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/hclwrite/ast_body.go b/hclwrite/ast_body.go
index f421662..6808373 100644
--- a/hclwrite/ast_body.go
+++ b/hclwrite/ast_body.go
@@ -1,8 +1,8 @@
 package hclwrite
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/hclwrite/ast_body_test.go b/hclwrite/ast_body_test.go
index 3130ae5..231c5e7 100644
--- a/hclwrite/ast_body_test.go
+++ b/hclwrite/ast_body_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/hclwrite/ast_expression.go b/hclwrite/ast_expression.go
index a1caa3a..854e716 100644
--- a/hclwrite/ast_expression.go
+++ b/hclwrite/ast_expression.go
@@ -3,8 +3,8 @@ package hclwrite
 import (
 	"fmt"
 
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/hclwrite/examples_test.go b/hclwrite/examples_test.go
index 4f00add..78882ef 100644
--- a/hclwrite/examples_test.go
+++ b/hclwrite/examples_test.go
@@ -3,7 +3,7 @@ package hclwrite_test
 import (
 	"fmt"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclwrite"
 	"github.com/zclconf/go-cty/cty"
 )
diff --git a/hclwrite/format.go b/hclwrite/format.go
index 17dbd5e..b94bee3 100644
--- a/hclwrite/format.go
+++ b/hclwrite/format.go
@@ -1,7 +1,7 @@
 package hclwrite
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 )
 
 var inKeyword = hclsyntax.Keyword([]byte{'i', 'n'})
diff --git a/hclwrite/format_test.go b/hclwrite/format_test.go
index 948206d..241cc7a 100644
--- a/hclwrite/format_test.go
+++ b/hclwrite/format_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 )
 
 func TestFormat(t *testing.T) {
diff --git a/hclwrite/generate.go b/hclwrite/generate.go
index 5ec1dd1..289a30d 100644
--- a/hclwrite/generate.go
+++ b/hclwrite/generate.go
@@ -5,8 +5,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/hclwrite/generate_test.go b/hclwrite/generate_test.go
index a8c215d..7c437e2 100644
--- a/hclwrite/generate_test.go
+++ b/hclwrite/generate_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/hclwrite/native_node_sorter.go b/hclwrite/native_node_sorter.go
index 28e740a..cedf686 100644
--- a/hclwrite/native_node_sorter.go
+++ b/hclwrite/native_node_sorter.go
@@ -1,7 +1,7 @@
 package hclwrite
 
 import (
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 )
 
 type nativeNodeSorter struct {
diff --git a/hclwrite/parser.go b/hclwrite/parser.go
index a3cbe3d..d6cf532 100644
--- a/hclwrite/parser.go
+++ b/hclwrite/parser.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/zclconf/go-cty/cty"
 )
 
diff --git a/hclwrite/parser_test.go b/hclwrite/parser_test.go
index c5d5228..8ac82f5 100644
--- a/hclwrite/parser_test.go
+++ b/hclwrite/parser_test.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/kylelemons/godebug/pretty"
 
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 )
 
 func TestParse(t *testing.T) {
diff --git a/hclwrite/public.go b/hclwrite/public.go
index 85f89ed..678a3aa 100644
--- a/hclwrite/public.go
+++ b/hclwrite/public.go
@@ -3,7 +3,7 @@ package hclwrite
 import (
 	"bytes"
 
-	"github.com/hashicorp/hcl/v2/hcl"
+	"github.com/hashicorp/hcl/v2"
 )
 
 // NewFile creates a new file object that is empty and ready to have constructs
diff --git a/hclwrite/round_trip_test.go b/hclwrite/round_trip_test.go
index 8536bbd..14001df 100644
--- a/hclwrite/round_trip_test.go
+++ b/hclwrite/round_trip_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/zclconf/go-cty/cty/function"
 	"github.com/zclconf/go-cty/cty/function/stdlib"
 
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 )
 
 func TestRoundTripVerbatim(t *testing.T) {
diff --git a/hclwrite/tokens.go b/hclwrite/tokens.go
index 6707d89..3bd3e5f 100644
--- a/hclwrite/tokens.go
+++ b/hclwrite/tokens.go
@@ -5,8 +5,8 @@ import (
 	"io"
 
 	"github.com/apparentlymart/go-textseg/textseg"
-	"github.com/hashicorp/hcl/v2/hcl"
-	"github.com/hashicorp/hcl/v2/hcl/hclsyntax"
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclsyntax"
 )
 
 // Token is a single sequence of bytes annotated with a type. It is similar