diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus.Core.Parsers.Hcl.Tests.csproj b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus.CoreParsers.Hcl.Tests.csproj
similarity index 90%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus.Core.Parsers.Hcl.Tests.csproj
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus.CoreParsers.Hcl.Tests.csproj
index 37d745f..6d23411 100644
--- a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus.Core.Parsers.Hcl.Tests.csproj
+++ b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus.CoreParsers.Hcl.Tests.csproj
@@ -20,11 +20,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Octopus.Core.Parsers.Hcl\Octopus.Core.Parsers.Hcl.csproj" />
+    <ProjectReference Include="..\Octopus.Core.Parsers.Hcl\Octopus.CoreParsers.Hcl.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Octopus\Core\Parsers\Hcl\TemplateSamples\*">
+    <None Update="Octopus\CoreParsers\Hcl\TemplateSamples\*">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/HclTemplateParserTest.cs b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/HclTemplateParserTest.cs
similarity index 99%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/HclTemplateParserTest.cs
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/HclTemplateParserTest.cs
index 09b0bba..eb1c032 100644
--- a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/HclTemplateParserTest.cs
+++ b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/HclTemplateParserTest.cs
@@ -2,10 +2,9 @@
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
-using Octopus.Core.Parsers.Hcl;
 using Sprache;
 
-namespace Octopus.Tests.Octopus.Terraform.Templates
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Tested based on https://github.com/hashicorp/hcl/blob/a4b07c25de5ff55ad3b8936cea69a79a3d95a855/hcl/parser/parser_test.go
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/ListWithBool.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/ListWithBool.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/ListWithBool.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/ListWithBool.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/MapWithListWIthBool.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/MapWithListWIthBool.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/MapWithListWIthBool.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/MapWithListWIthBool.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/array_comment.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/array_comment.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/array_comment.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/array_comment.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/array_comment_2.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/array_comment_2.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/array_comment_2.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/array_comment_2.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/assign_colon.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/assign_colon.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/assign_colon.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/assign_colon.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/assign_deep.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/assign_deep.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/assign_deep.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/assign_deep.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/aws.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/aws.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/aws.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/aws.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/basic.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/basic.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/basic.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/basic.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/basic.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/basic.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/basic.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/basic.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/basic_int_string.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/basic_int_string.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/basic_int_string.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/basic_int_string.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/basic_squish.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/basic_squish.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/basic_squish.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/basic_squish.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/block_assign.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/block_assign.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/block_assign.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/block_assign.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment_crlf.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment_crlf.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment_crlf.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment_crlf.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment_lastline.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment_lastline.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment_lastline.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment_lastline.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment_single.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment_single.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/comment_single.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/comment_single.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/commentsingleline.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/commentsingleline.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/commentsingleline.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/commentsingleline.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/complex.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/complex.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/complex.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/complex.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/complex_crlf.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/complex_crlf.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/complex_crlf.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/complex_crlf.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/complex_key.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/complex_key.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/complex_key.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/complex_key.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/complex_unicode.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/complex_unicode.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/complex_unicode.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/complex_unicode.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/curlytexttest.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/curlytexttest.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/curlytexttest.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/curlytexttest.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/decode_policy.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/decode_policy.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/decode_policy.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/decode_policy.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/decode_policy.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/decode_policy.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/decode_policy.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/decode_policy.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/decode_tf_variable.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/decode_tf_variable.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/decode_tf_variable.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/decode_tf_variable.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/decode_tf_variable.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/decode_tf_variable.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/decode_tf_variable.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/decode_tf_variable.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/empty.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/empty.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/empty.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/empty.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/empty.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/empty.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/empty.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/empty.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/emptyresource.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/emptyresource.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/emptyresource.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/emptyresource.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/escape.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/escape.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/escape.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/escape.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/escape_backslash.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/escape_backslash.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/escape_backslash.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/escape_backslash.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/escaped_interpolation.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/escaped_interpolation.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/escaped_interpolation.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/escaped_interpolation.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example1.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example1.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example1.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example1.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example10.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example10.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example10.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example10.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example11.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example11.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example11.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example11.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example12.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example12.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example12.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example12.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example13.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example13.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example13.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example13.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example14.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example14.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example14.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example14.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example15.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example15.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example15.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example15.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example16.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example16.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example16.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example16.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example17.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example17.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example17.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example17.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example18.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example18.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example18.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example18.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example19.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example19.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example19.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example19.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example2.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example2.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example2.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example2.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example20.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example20.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example20.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example20.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example21.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example21.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example21.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example21.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example22.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example22.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example22.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example22.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example23.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example23.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example23.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example23.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example24.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example24.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example24.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example24.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example25.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example25.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example25.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example25.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example26.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example26.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example26.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example26.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example27.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example27.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example27.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example27.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example28.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example28.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example28.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example28.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example29.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example29.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example29.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example29.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example3.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example3.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example3.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example3.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example30.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example30.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example30.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example30.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example31.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example31.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example31.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example31.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example32.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example32.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example32.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example32.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example33.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example33.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example33.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example33.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example34.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example34.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example34.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example34.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example35.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example35.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example35.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example35.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example36.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example36.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example36.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example36.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example37.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example37.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example37.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example37.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example38.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example38.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example38.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example38.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example39.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example39.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example39.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example39.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example4.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example4.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example4.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example4.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example40.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example40.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example40.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example40.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example41.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example41.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example41.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example41.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example42.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example42.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example42.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example42.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example43.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example43.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example43.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example43.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example44.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example44.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example44.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example44.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example45.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example45.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example45.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example45.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example46.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example46.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example46.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example46.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example47.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example47.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example47.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example47.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example48.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example48.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example48.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example48.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example49.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example49.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example49.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example49.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example5.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example5.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example5.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example5.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example50.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example50.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example50.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example50.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example51.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example51.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example51.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example51.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example52.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example52.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example52.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example52.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example53.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example53.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example53.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example53.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example54.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example54.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example54.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example54.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example55.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example55.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example55.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example55.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example56.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example56.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example56.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example56.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example57.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example57.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example57.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example57.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example58.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example58.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example58.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example58.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example59.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example59.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example59.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example59.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example6.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example6.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example6.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example6.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example60.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example60.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example60.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example60.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example61.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example61.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example61.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example61.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example62.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example62.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example62.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example62.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example63.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example63.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example63.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example63.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example64.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example64.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example64.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example64.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example65.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example65.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example65.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example65.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example66.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example66.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example66.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example66.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example67.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example67.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example67.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example67.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example68.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example68.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example68.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example68.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example69.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example69.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example69.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example69.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example7.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example7.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example7.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example7.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example70.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example70.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example70.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example70.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example71.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example71.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example71.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example71.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example72.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example72.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example72.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example72.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example73.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example73.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example73.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example73.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example74.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example74.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example74.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example74.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example75.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example75.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example75.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example75.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example76.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example76.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example76.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example76.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example77.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example77.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example77.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example77.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example78.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example78.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example78.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example78.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example79.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example79.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example79.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example79.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example8.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example8.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example8.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example8.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example80.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example80.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example80.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example80.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example81.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example81.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example81.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example81.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example82.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example82.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example82.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example82.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example83.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example83.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example83.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example83.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example84.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example84.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example84.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example84.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example85.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example85.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example85.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example85.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example86.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example86.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example86.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example86.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example87.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example87.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example87.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example87.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example88.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example88.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example88.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example88.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example89.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example89.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example89.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example89.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example9.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example9.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example9.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example9.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example90.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example90.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example90.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example90.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example91.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example91.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example91.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example91.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example92.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example92.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example92.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example92.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example93.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example93.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example93.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example93.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example94.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example94.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example94.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example94.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example95.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example95.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example95.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example95.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example96.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example96.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example96.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example96.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example97.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example97.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example97.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example97.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example98.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example98.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example98.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example98.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example99.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example99.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/example99.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/example99.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/exmaple54.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/exmaple54.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/exmaple54.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/exmaple54.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/flat.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/flat.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/flat.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/flat.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/float.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/float.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/float.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/float.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/float.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/float.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/float.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/float.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/git_crypt.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/git_crypt.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/git_crypt.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/git_crypt.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/heredocdescription.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/heredocdescription.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/heredocdescription.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/heredocdescription.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/interpolate.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/interpolate.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/interpolate.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/interpolate.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/interpolation.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/interpolation.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/interpolation.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/interpolation.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/key_without_value.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/key_without_value.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/key_without_value.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/key_without_value.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/list.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/list.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/list.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/list.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/list_comma.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/list_comma.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/list_comma.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/list_comma.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/list_of_lists.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/list_of_lists.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/list_of_lists.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/list_of_lists.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/list_of_maps.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/list_of_maps.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/list_of_maps.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/list_of_maps.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/map.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/map.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/map.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/map.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/map_colon.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/map_colon.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/map_colon.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/map_colon.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/missing_braces.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/missing_braces.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/missing_braces.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/missing_braces.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/mixedtext.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/mixedtext.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/mixedtext.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/mixedtext.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_bad.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_bad.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_bad.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_bad.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_indented.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_indented.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_indented.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_indented.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_literal.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_literal.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_literal.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_literal.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_literal_with_hil.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_literal_with_hil.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_literal_with_hil.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_literal_with_hil.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_no_eof.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_no_eof.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_no_eof.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_no_eof.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_no_hanging_indent.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_no_hanging_indent.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_no_hanging_indent.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_no_hanging_indent.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_no_marker.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_no_marker.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiline_no_marker.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiline_no_marker.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multilinestring.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multilinestring.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multilinestring.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multilinestring.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiple.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiple.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/multiple.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multiple.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/nested_block_comment.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/nested_block_comment.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/nested_block_comment.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/nested_block_comment.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/nested_interpolation.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/nested_interpolation.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/nested_interpolation.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/nested_interpolation.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/nested_provider_bad.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/nested_provider_bad.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/nested_provider_bad.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/nested_provider_bad.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/null_strings.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/null_strings.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/null_strings.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/null_strings.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_key_assign_without_value.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_key_assign_without_value.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_key_assign_without_value.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_key_assign_without_value.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_key_assign_without_value2.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_key_assign_without_value2.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_key_assign_without_value2.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_key_assign_without_value2.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_key_assign_without_value3.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_key_assign_without_value3.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_key_assign_without_value3.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_key_assign_without_value3.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_key_without_value.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_key_without_value.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_key_without_value.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_key_without_value.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_list.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_list.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_list.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_list.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_list_comma.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_list_comma.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_list_comma.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_list_comma.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_with_bool.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_with_bool.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/object_with_bool.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/object_with_bool.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/old.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/old.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/old.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/old.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/quotedtext.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/quotedtext.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/quotedtext.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/quotedtext.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/quotedtext_raw.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/quotedtext_raw.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/quotedtext_raw.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/quotedtext_raw.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/quotes.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/quotes.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/quotes.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/quotes.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/resource.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/resource.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/resource.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/resource.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/resourcewithchildren.tf b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/resourcewithchildren.tf
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/resourcewithchildren.tf
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/resourcewithchildren.tf
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/scientific.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/scientific.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/scientific.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/scientific.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/scientific.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/scientific.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/scientific.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/scientific.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/slice_expand.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/slice_expand.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/slice_expand.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/slice_expand.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/string_without_interpolation_parsing.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/string_without_interpolation_parsing.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/string_without_interpolation_parsing.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/string_without_interpolation_parsing.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure2.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure2.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure2.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure2.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure2.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure2.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure2.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure2.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_basic.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_basic.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_basic.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_basic.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_empty.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_empty.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_empty.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_empty.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_flat.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_flat.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_flat.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_flat.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_flatmap.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_flatmap.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_flatmap.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_flatmap.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_list.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_list.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_list.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_list.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_list.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_list.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_list.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_list.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_list_deep.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_list_deep.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_list_deep.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_list_deep.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_list_empty.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_list_empty.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_list_empty.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_list_empty.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_multi.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_multi.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_multi.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_multi.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_multi.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_multi.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/structure_multi.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/structure_multi.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/terraform_heroku.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/terraform_heroku.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/terraform_heroku.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/terraform_heroku.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/terraform_heroku.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/terraform_heroku.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/terraform_heroku.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/terraform_heroku.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/terraform_variable_invalid.json b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/terraform_variable_invalid.json
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/terraform_variable_invalid.json
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/terraform_variable_invalid.json
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/test1.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/test1.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/test1.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/test1.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/test2.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/test2.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/test2.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/test2.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/test3.txt b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/test3.txt
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/test3.txt
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/test3.txt
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/tfvars.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/tfvars.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/tfvars.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/tfvars.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/types.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/types.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/types.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/types.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/unterminated_block_comment.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/unterminated_block_comment.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/unterminated_block_comment.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/unterminated_block_comment.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/unterminated_brace.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/unterminated_brace.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/unterminated_brace.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/unterminated_brace.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/unterminated_object.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/unterminated_object.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/unterminated_object.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/unterminated_object.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/unterminated_object_2.hcl b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/unterminated_object_2.hcl
similarity index 100%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TemplateSamples/unterminated_object_2.hcl
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/unterminated_object_2.hcl
diff --git a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TerraformTemplateLoader.cs b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TerraformTemplateLoader.cs
similarity index 93%
rename from source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TerraformTemplateLoader.cs
rename to source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TerraformTemplateLoader.cs
index b9de4cc..9f4fdd5 100644
--- a/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/Core/Parsers/Hcl/TerraformTemplateLoader.cs
+++ b/source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TerraformTemplateLoader.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     public class TerraformTemplateLoader
     {
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus.Core.Parsers.Hcl.csproj b/source/Octopus.Core.Parsers.Hcl/Octopus.CoreParsers.Hcl.csproj
similarity index 85%
rename from source/Octopus.Core.Parsers.Hcl/Octopus.Core.Parsers.Hcl.csproj
rename to source/Octopus.Core.Parsers.Hcl/Octopus.CoreParsers.Hcl.csproj
index 7dc6465..0612e9a 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus.Core.Parsers.Hcl.csproj
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus.CoreParsers.Hcl.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net40</TargetFrameworks>
 	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+	<AssemblyName>Octopus.CoreParsers.Hcl</AssemblyName>
+	<RootNamespace>Octopus.Core.Parsers.Hcl</RootNamespace>
   </PropertyGroup>  
 
   <ItemGroup>
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclCommentElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclCommentElement.cs
similarity index 93%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclCommentElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclCommentElement.cs
index e3d3db0..c5d7910 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclCommentElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclCommentElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents a single line comment
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HCLElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclElement.cs
similarity index 99%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HCLElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclElement.cs
index d04af3a..6cd3ab7 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HCLElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclElement.cs
@@ -4,7 +4,7 @@
 using Octopus.CoreUtilities.Extensions;
 using Sprache;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     public class HclElement
     {
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclHereDocElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclHereDocElement.cs
similarity index 97%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclHereDocElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclHereDocElement.cs
index f750a0c..39cd17a 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclHereDocElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclHereDocElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary><![CDATA[
     /// Represents the value of a heredoc string.
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclHereDocPropertyElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclHereDocPropertyElement.cs
similarity index 95%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclHereDocPropertyElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclHereDocPropertyElement.cs
index 3a412dc..6d052a1 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclHereDocPropertyElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclHereDocPropertyElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary><![CDATA[
     /// Represents the value of a heredoc string assigned to a property.
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclListElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclListElement.cs
similarity index 97%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclListElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclListElement.cs
index be36ab6..6d0d267 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclListElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclListElement.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents a list
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclListPropertyElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclListPropertyElement.cs
similarity index 94%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclListPropertyElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclListPropertyElement.cs
index df38cf9..d327492 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclListPropertyElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclListPropertyElement.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents a list assigned to a property
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMapElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMapElement.cs
similarity index 93%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMapElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMapElement.cs
index 183eea6..adde580 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMapElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMapElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents a map
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMapPropertyElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMapPropertyElement.cs
similarity index 95%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMapPropertyElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMapPropertyElement.cs
index 6458a83..9669bd2 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMapPropertyElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMapPropertyElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents a map assigned to a property
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMultiLineCommentElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMultiLineCommentElement.cs
similarity index 92%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMultiLineCommentElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMultiLineCommentElement.cs
index 8acd94b..b65b571 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclMultiLineCommentElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclMultiLineCommentElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents a multiline comment
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HCLParser.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclParser.cs
similarity index 99%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HCLParser.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclParser.cs
index 856ec3d..9adc502 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HCLParser.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclParser.cs
@@ -3,7 +3,7 @@
 using System.Text.RegularExpressions;
 using Sprache;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// A Sprache parser for the HCL library.
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclRootElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclRootElement.cs
similarity index 93%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclRootElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclRootElement.cs
index 3e74eb6..1c7f2fe 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclRootElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclRootElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents the document root
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclStringElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclStringElement.cs
similarity index 92%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclStringElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclStringElement.cs
index c2b8946..26ba218 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclStringElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclStringElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents a string
diff --git a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclStringPropertyElement.cs b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclStringPropertyElement.cs
similarity index 94%
rename from source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclStringPropertyElement.cs
rename to source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclStringPropertyElement.cs
index 0d6c709..dcbb031 100644
--- a/source/Octopus.Core.Parsers.Hcl/Octopus/Core/Parsers/Hcl/HclStringPropertyElement.cs
+++ b/source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclStringPropertyElement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace Octopus.Core.Parsers.Hcl
+namespace Octopus.CoreParsers.Hcl
 {
     /// <summary>
     /// Represents a string assigned to a property
diff --git a/source/Octopus.Core.Parsers.Hcl.sln b/source/Octopus.CoreParsers.Hcl.sln
similarity index 85%
rename from source/Octopus.Core.Parsers.Hcl.sln
rename to source/Octopus.CoreParsers.Hcl.sln
index 94e2bdd..6091b61 100644
--- a/source/Octopus.Core.Parsers.Hcl.sln
+++ b/source/Octopus.CoreParsers.Hcl.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27604.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octopus.Core.Parsers.Hcl.Tests", "Octopus.Core.Parsers.Hcl.Tests\Octopus.Core.Parsers.Hcl.Tests.csproj", "{C2D0CE75-2222-4B3B-8D02-D5DE8E2E887B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octopus.CoreParsers.Hcl.Tests", "Octopus.Core.Parsers.Hcl.Tests\Octopus.CoreParsers.Hcl.Tests.csproj", "{C2D0CE75-2222-4B3B-8D02-D5DE8E2E887B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octopus.Core.Parsers.Hcl", "Octopus.Core.Parsers.Hcl\Octopus.Core.Parsers.Hcl.csproj", "{2C02A830-2CA9-4547-B49A-60B7E8DB6B96}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octopus.CoreParsers.Hcl", "Octopus.Core.Parsers.Hcl\Octopus.CoreParsers.Hcl.csproj", "{2C02A830-2CA9-4547-B49A-60B7E8DB6B96}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution