Repository: tfsec/tfsec
Pull request #437 (2020-10-16 10:23:58)

put checks back in the  checks package so init gets called.


Patch:
diff --git a/internal/app/tfsec/checks/aws/aws001.go b/internal/app/tfsec/checks/aws001.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws001.go
rename to internal/app/tfsec/checks/aws001.go
index 9f8a70b8f..522119ad1 100644
--- a/internal/app/tfsec/checks/aws/aws001.go
+++ b/internal/app/tfsec/checks/aws001.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws002.go b/internal/app/tfsec/checks/aws002.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws002.go
rename to internal/app/tfsec/checks/aws002.go
index ab1438f0a..ab911fb8b 100644
--- a/internal/app/tfsec/checks/aws/aws002.go
+++ b/internal/app/tfsec/checks/aws002.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws003.go b/internal/app/tfsec/checks/aws003.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws003.go
rename to internal/app/tfsec/checks/aws003.go
index 1ac4eb995..f199dac94 100644
--- a/internal/app/tfsec/checks/aws/aws003.go
+++ b/internal/app/tfsec/checks/aws003.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws004.go b/internal/app/tfsec/checks/aws004.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws004.go
rename to internal/app/tfsec/checks/aws004.go
index b3dded9a2..30f90c5ef 100644
--- a/internal/app/tfsec/checks/aws/aws004.go
+++ b/internal/app/tfsec/checks/aws004.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws005.go b/internal/app/tfsec/checks/aws005.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws005.go
rename to internal/app/tfsec/checks/aws005.go
index 63a03475e..e3e05012d 100644
--- a/internal/app/tfsec/checks/aws/aws005.go
+++ b/internal/app/tfsec/checks/aws005.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws006.go b/internal/app/tfsec/checks/aws006.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws006.go
rename to internal/app/tfsec/checks/aws006.go
index 237ad977c..36f16ad84 100644
--- a/internal/app/tfsec/checks/aws/aws006.go
+++ b/internal/app/tfsec/checks/aws006.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws007.go b/internal/app/tfsec/checks/aws007.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws007.go
rename to internal/app/tfsec/checks/aws007.go
index 78501b979..ffa174312 100644
--- a/internal/app/tfsec/checks/aws/aws007.go
+++ b/internal/app/tfsec/checks/aws007.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws008.go b/internal/app/tfsec/checks/aws008.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws008.go
rename to internal/app/tfsec/checks/aws008.go
index 203729ee0..1fc1a75a6 100644
--- a/internal/app/tfsec/checks/aws/aws008.go
+++ b/internal/app/tfsec/checks/aws008.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws009.go b/internal/app/tfsec/checks/aws009.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws009.go
rename to internal/app/tfsec/checks/aws009.go
index 17c40ebd7..404bca22c 100644
--- a/internal/app/tfsec/checks/aws/aws009.go
+++ b/internal/app/tfsec/checks/aws009.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws010.go b/internal/app/tfsec/checks/aws010.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws010.go
rename to internal/app/tfsec/checks/aws010.go
index e679873e1..134597b0e 100644
--- a/internal/app/tfsec/checks/aws/aws010.go
+++ b/internal/app/tfsec/checks/aws010.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws011.go b/internal/app/tfsec/checks/aws011.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws011.go
rename to internal/app/tfsec/checks/aws011.go
index 10d9dc829..7ddd1c64d 100644
--- a/internal/app/tfsec/checks/aws/aws011.go
+++ b/internal/app/tfsec/checks/aws011.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws012.go b/internal/app/tfsec/checks/aws012.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws012.go
rename to internal/app/tfsec/checks/aws012.go
index 2367dea5d..10a1df617 100644
--- a/internal/app/tfsec/checks/aws/aws012.go
+++ b/internal/app/tfsec/checks/aws012.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws013.go b/internal/app/tfsec/checks/aws013.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws013.go
rename to internal/app/tfsec/checks/aws013.go
index 6b7c1d820..db731e64e 100644
--- a/internal/app/tfsec/checks/aws/aws013.go
+++ b/internal/app/tfsec/checks/aws013.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"encoding/json"
diff --git a/internal/app/tfsec/checks/aws/aws014.go b/internal/app/tfsec/checks/aws014.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws014.go
rename to internal/app/tfsec/checks/aws014.go
index 5be8b9c3b..457baa7ab 100644
--- a/internal/app/tfsec/checks/aws/aws014.go
+++ b/internal/app/tfsec/checks/aws014.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws015.go b/internal/app/tfsec/checks/aws015.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws015.go
rename to internal/app/tfsec/checks/aws015.go
index d85cfa011..1f5c27673 100644
--- a/internal/app/tfsec/checks/aws/aws015.go
+++ b/internal/app/tfsec/checks/aws015.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws016.go b/internal/app/tfsec/checks/aws016.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws016.go
rename to internal/app/tfsec/checks/aws016.go
index 7e9f9f2c8..d471ce474 100644
--- a/internal/app/tfsec/checks/aws/aws016.go
+++ b/internal/app/tfsec/checks/aws016.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws017.go b/internal/app/tfsec/checks/aws017.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws017.go
rename to internal/app/tfsec/checks/aws017.go
index 36a8cae08..2312e1b00 100644
--- a/internal/app/tfsec/checks/aws/aws017.go
+++ b/internal/app/tfsec/checks/aws017.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws018.go b/internal/app/tfsec/checks/aws018.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws018.go
rename to internal/app/tfsec/checks/aws018.go
index 9405d5804..95512031e 100644
--- a/internal/app/tfsec/checks/aws/aws018.go
+++ b/internal/app/tfsec/checks/aws018.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws019.go b/internal/app/tfsec/checks/aws019.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws019.go
rename to internal/app/tfsec/checks/aws019.go
index cea3e879c..be53ef88e 100644
--- a/internal/app/tfsec/checks/aws/aws019.go
+++ b/internal/app/tfsec/checks/aws019.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws020.go b/internal/app/tfsec/checks/aws020.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws020.go
rename to internal/app/tfsec/checks/aws020.go
index a16e8e0cb..7e4c5315b 100644
--- a/internal/app/tfsec/checks/aws/aws020.go
+++ b/internal/app/tfsec/checks/aws020.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws021.go b/internal/app/tfsec/checks/aws021.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws021.go
rename to internal/app/tfsec/checks/aws021.go
index c93f480b3..92ed577f1 100644
--- a/internal/app/tfsec/checks/aws/aws021.go
+++ b/internal/app/tfsec/checks/aws021.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws022.go b/internal/app/tfsec/checks/aws022.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws022.go
rename to internal/app/tfsec/checks/aws022.go
index f69d5b081..691988936 100644
--- a/internal/app/tfsec/checks/aws/aws022.go
+++ b/internal/app/tfsec/checks/aws022.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws023.go b/internal/app/tfsec/checks/aws023.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws023.go
rename to internal/app/tfsec/checks/aws023.go
index 8c4b2f306..26dcfa38d 100644
--- a/internal/app/tfsec/checks/aws/aws023.go
+++ b/internal/app/tfsec/checks/aws023.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws024.go b/internal/app/tfsec/checks/aws024.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws024.go
rename to internal/app/tfsec/checks/aws024.go
index 9c099c3be..954d49c74 100644
--- a/internal/app/tfsec/checks/aws/aws024.go
+++ b/internal/app/tfsec/checks/aws024.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws025.go b/internal/app/tfsec/checks/aws025.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws025.go
rename to internal/app/tfsec/checks/aws025.go
index 0cf94c5d5..5c9c3f791 100644
--- a/internal/app/tfsec/checks/aws/aws025.go
+++ b/internal/app/tfsec/checks/aws025.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws031.go b/internal/app/tfsec/checks/aws031.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws031.go
rename to internal/app/tfsec/checks/aws031.go
index 0d6874d2e..ec79eda6a 100644
--- a/internal/app/tfsec/checks/aws/aws031.go
+++ b/internal/app/tfsec/checks/aws031.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws032.go b/internal/app/tfsec/checks/aws032.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws032.go
rename to internal/app/tfsec/checks/aws032.go
index 11cf54de4..d74204c0a 100644
--- a/internal/app/tfsec/checks/aws/aws032.go
+++ b/internal/app/tfsec/checks/aws032.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws033.go b/internal/app/tfsec/checks/aws033.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws033.go
rename to internal/app/tfsec/checks/aws033.go
index 4d1675da1..10e19e8bd 100644
--- a/internal/app/tfsec/checks/aws/aws033.go
+++ b/internal/app/tfsec/checks/aws033.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws034.go b/internal/app/tfsec/checks/aws034.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws034.go
rename to internal/app/tfsec/checks/aws034.go
index dd0d99554..0fe4dc16f 100644
--- a/internal/app/tfsec/checks/aws/aws034.go
+++ b/internal/app/tfsec/checks/aws034.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws035.go b/internal/app/tfsec/checks/aws035.go
similarity index 94%
rename from internal/app/tfsec/checks/aws/aws035.go
rename to internal/app/tfsec/checks/aws035.go
index d0d5d44ce..be93a894f 100644
--- a/internal/app/tfsec/checks/aws/aws035.go
+++ b/internal/app/tfsec/checks/aws035.go
@@ -1,9 +1,8 @@
-package aws
+package checks
 
 import (
 	"fmt"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 
 	"github.com/tfsec/tfsec/internal/app/tfsec/parser"
@@ -46,7 +45,7 @@ func init() {
 						scanner.SeverityError,
 					),
 				}
-			} else if !checks.IsBooleanOrStringTrue(encryptionAttr) {
+			} else if !isBooleanOrStringTrue(encryptionAttr) {
 				return []scanner.Result{
 					check.NewResultWithValueAnnotation(
 						fmt.Sprintf("Resource '%s' defines an unencrypted Elasticache Replication Group (at_rest_encryption_enabled set to false).", block.Name()),
diff --git a/internal/app/tfsec/checks/aws/aws036.go b/internal/app/tfsec/checks/aws036.go
similarity index 94%
rename from internal/app/tfsec/checks/aws/aws036.go
rename to internal/app/tfsec/checks/aws036.go
index dfe76fcec..cdbb9d724 100644
--- a/internal/app/tfsec/checks/aws/aws036.go
+++ b/internal/app/tfsec/checks/aws036.go
@@ -1,9 +1,8 @@
-package aws
+package checks
 
 import (
 	"fmt"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 
 	"github.com/tfsec/tfsec/internal/app/tfsec/parser"
@@ -46,7 +45,7 @@ func init() {
 						scanner.SeverityError,
 					),
 				}
-			} else if !checks.IsBooleanOrStringTrue(encryptionAttr) {
+			} else if !isBooleanOrStringTrue(encryptionAttr) {
 				return []scanner.Result{
 					check.NewResultWithValueAnnotation(
 						fmt.Sprintf("Resource '%s' defines an unencrypted Elasticache Replication Group (transit_encryption_enabled set to false).", block.Name()),
diff --git a/internal/app/tfsec/checks/aws/aws037.go b/internal/app/tfsec/checks/aws037.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws037.go
rename to internal/app/tfsec/checks/aws037.go
index c55ed8f23..09e6e13f8 100644
--- a/internal/app/tfsec/checks/aws/aws037.go
+++ b/internal/app/tfsec/checks/aws037.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws038.go b/internal/app/tfsec/checks/aws038.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws038.go
rename to internal/app/tfsec/checks/aws038.go
index 46a311353..66410e25a 100644
--- a/internal/app/tfsec/checks/aws/aws038.go
+++ b/internal/app/tfsec/checks/aws038.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws039.go b/internal/app/tfsec/checks/aws039.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws039.go
rename to internal/app/tfsec/checks/aws039.go
index d18cc342e..43b1a5bf6 100644
--- a/internal/app/tfsec/checks/aws/aws039.go
+++ b/internal/app/tfsec/checks/aws039.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws040.go b/internal/app/tfsec/checks/aws040.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws040.go
rename to internal/app/tfsec/checks/aws040.go
index b02a92e8a..31c350eba 100644
--- a/internal/app/tfsec/checks/aws/aws040.go
+++ b/internal/app/tfsec/checks/aws040.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws041.go b/internal/app/tfsec/checks/aws041.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws041.go
rename to internal/app/tfsec/checks/aws041.go
index 9a3c15a97..9af858173 100644
--- a/internal/app/tfsec/checks/aws/aws041.go
+++ b/internal/app/tfsec/checks/aws041.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws042.go b/internal/app/tfsec/checks/aws042.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws042.go
rename to internal/app/tfsec/checks/aws042.go
index 77f64a6a2..0933363a0 100644
--- a/internal/app/tfsec/checks/aws/aws042.go
+++ b/internal/app/tfsec/checks/aws042.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws043.go b/internal/app/tfsec/checks/aws043.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws043.go
rename to internal/app/tfsec/checks/aws043.go
index 9d3b42cfd..c8de32949 100644
--- a/internal/app/tfsec/checks/aws/aws043.go
+++ b/internal/app/tfsec/checks/aws043.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws044.go b/internal/app/tfsec/checks/aws044.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws044.go
rename to internal/app/tfsec/checks/aws044.go
index 690dd1702..47021f097 100644
--- a/internal/app/tfsec/checks/aws/aws044.go
+++ b/internal/app/tfsec/checks/aws044.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws045.go b/internal/app/tfsec/checks/aws045.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws045.go
rename to internal/app/tfsec/checks/aws045.go
index 8eb4c01ba..37f8ae00c 100644
--- a/internal/app/tfsec/checks/aws/aws045.go
+++ b/internal/app/tfsec/checks/aws045.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/aws/aws046.go b/internal/app/tfsec/checks/aws046.go
similarity index 99%
rename from internal/app/tfsec/checks/aws/aws046.go
rename to internal/app/tfsec/checks/aws046.go
index 500f1781c..3f6a3336d 100644
--- a/internal/app/tfsec/checks/aws/aws046.go
+++ b/internal/app/tfsec/checks/aws046.go
@@ -1,4 +1,4 @@
-package aws
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/azure/azu001.go b/internal/app/tfsec/checks/azu001.go
similarity index 99%
rename from internal/app/tfsec/checks/azure/azu001.go
rename to internal/app/tfsec/checks/azu001.go
index 36e8290d7..bdae466d1 100644
--- a/internal/app/tfsec/checks/azure/azu001.go
+++ b/internal/app/tfsec/checks/azu001.go
@@ -1,4 +1,4 @@
-package azure
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/azure/azu002.go b/internal/app/tfsec/checks/azu002.go
similarity index 99%
rename from internal/app/tfsec/checks/azure/azu002.go
rename to internal/app/tfsec/checks/azu002.go
index c344f38a7..a18e4afeb 100644
--- a/internal/app/tfsec/checks/azure/azu002.go
+++ b/internal/app/tfsec/checks/azu002.go
@@ -1,4 +1,4 @@
-package azure
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/azure/azu003.go b/internal/app/tfsec/checks/azu003.go
similarity index 99%
rename from internal/app/tfsec/checks/azure/azu003.go
rename to internal/app/tfsec/checks/azu003.go
index 39169f09f..74f94d82a 100644
--- a/internal/app/tfsec/checks/azure/azu003.go
+++ b/internal/app/tfsec/checks/azu003.go
@@ -1,4 +1,4 @@
-package azure
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/azure/azu004.go b/internal/app/tfsec/checks/azu004.go
similarity index 99%
rename from internal/app/tfsec/checks/azure/azu004.go
rename to internal/app/tfsec/checks/azu004.go
index 849750538..167a82635 100644
--- a/internal/app/tfsec/checks/azure/azu004.go
+++ b/internal/app/tfsec/checks/azu004.go
@@ -1,4 +1,4 @@
-package azure
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/azure/azu005.go b/internal/app/tfsec/checks/azu005.go
similarity index 99%
rename from internal/app/tfsec/checks/azure/azu005.go
rename to internal/app/tfsec/checks/azu005.go
index 62afa8a59..d8da0c232 100644
--- a/internal/app/tfsec/checks/azure/azu005.go
+++ b/internal/app/tfsec/checks/azu005.go
@@ -1,4 +1,4 @@
-package azure
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp001.go b/internal/app/tfsec/checks/gcp001.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp001.go
rename to internal/app/tfsec/checks/gcp001.go
index 5a8e86f17..f309365cc 100644
--- a/internal/app/tfsec/checks/google/gcp001.go
+++ b/internal/app/tfsec/checks/gcp001.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp002.go b/internal/app/tfsec/checks/gcp002.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp002.go
rename to internal/app/tfsec/checks/gcp002.go
index 39809f6ae..04e5c9185 100644
--- a/internal/app/tfsec/checks/google/gcp002.go
+++ b/internal/app/tfsec/checks/gcp002.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp003.go b/internal/app/tfsec/checks/gcp003.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp003.go
rename to internal/app/tfsec/checks/gcp003.go
index 370178210..00e40aa9a 100644
--- a/internal/app/tfsec/checks/google/gcp003.go
+++ b/internal/app/tfsec/checks/gcp003.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp004.go b/internal/app/tfsec/checks/gcp004.go
similarity index 98%
rename from internal/app/tfsec/checks/google/gcp004.go
rename to internal/app/tfsec/checks/gcp004.go
index 0836c55ca..97cf9c264 100644
--- a/internal/app/tfsec/checks/google/gcp004.go
+++ b/internal/app/tfsec/checks/gcp004.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp005.go b/internal/app/tfsec/checks/gcp005.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp005.go
rename to internal/app/tfsec/checks/gcp005.go
index adc7f3122..3a48842eb 100644
--- a/internal/app/tfsec/checks/google/gcp005.go
+++ b/internal/app/tfsec/checks/gcp005.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp006.go b/internal/app/tfsec/checks/gcp006.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp006.go
rename to internal/app/tfsec/checks/gcp006.go
index 3d2c346e1..6c91b0834 100644
--- a/internal/app/tfsec/checks/google/gcp006.go
+++ b/internal/app/tfsec/checks/gcp006.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp007.go b/internal/app/tfsec/checks/gcp007.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp007.go
rename to internal/app/tfsec/checks/gcp007.go
index 299c66f1b..46ed2a1a7 100644
--- a/internal/app/tfsec/checks/google/gcp007.go
+++ b/internal/app/tfsec/checks/gcp007.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp008.go b/internal/app/tfsec/checks/gcp008.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp008.go
rename to internal/app/tfsec/checks/gcp008.go
index 447073c1a..52e8bb46f 100644
--- a/internal/app/tfsec/checks/google/gcp008.go
+++ b/internal/app/tfsec/checks/gcp008.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp009.go b/internal/app/tfsec/checks/gcp009.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp009.go
rename to internal/app/tfsec/checks/gcp009.go
index 38a644744..1da0fd5cc 100644
--- a/internal/app/tfsec/checks/google/gcp009.go
+++ b/internal/app/tfsec/checks/gcp009.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp010.go b/internal/app/tfsec/checks/gcp010.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp010.go
rename to internal/app/tfsec/checks/gcp010.go
index c4823554a..08442b1bf 100644
--- a/internal/app/tfsec/checks/google/gcp010.go
+++ b/internal/app/tfsec/checks/gcp010.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/google/gcp011.go b/internal/app/tfsec/checks/gcp011.go
similarity index 99%
rename from internal/app/tfsec/checks/google/gcp011.go
rename to internal/app/tfsec/checks/gcp011.go
index c542cc931..824872135 100644
--- a/internal/app/tfsec/checks/google/gcp011.go
+++ b/internal/app/tfsec/checks/gcp011.go
@@ -1,4 +1,4 @@
-package google
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/general/gen001.go b/internal/app/tfsec/checks/gen001.go
similarity index 99%
rename from internal/app/tfsec/checks/general/gen001.go
rename to internal/app/tfsec/checks/gen001.go
index 19866b702..da9588e87 100644
--- a/internal/app/tfsec/checks/general/gen001.go
+++ b/internal/app/tfsec/checks/gen001.go
@@ -1,4 +1,4 @@
-package general
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/general/gen002.go b/internal/app/tfsec/checks/gen002.go
similarity index 99%
rename from internal/app/tfsec/checks/general/gen002.go
rename to internal/app/tfsec/checks/gen002.go
index adaaacada..8dadf9ced 100644
--- a/internal/app/tfsec/checks/general/gen002.go
+++ b/internal/app/tfsec/checks/gen002.go
@@ -1,4 +1,4 @@
-package general
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/general/gen003.go b/internal/app/tfsec/checks/gen003.go
similarity index 99%
rename from internal/app/tfsec/checks/general/gen003.go
rename to internal/app/tfsec/checks/gen003.go
index 3df57727b..0beed2cdc 100644
--- a/internal/app/tfsec/checks/general/gen003.go
+++ b/internal/app/tfsec/checks/gen003.go
@@ -1,4 +1,4 @@
-package general
+package checks
 
 import (
 	"fmt"
diff --git a/internal/app/tfsec/checks/utils.go b/internal/app/tfsec/checks/utils.go
index 8a9726b7a..7404d8410 100644
--- a/internal/app/tfsec/checks/utils.go
+++ b/internal/app/tfsec/checks/utils.go
@@ -5,9 +5,9 @@ import (
 	"github.com/zclconf/go-cty/cty"
 )
 
-// IsBooleanOrStringTrue returns true if the attribute is a boolean and is
+// isBooleanOrStringTrue returns true if the attribute is a boolean and is
 // `true` or if the attribute is a string and is `"true"`.
-func IsBooleanOrStringTrue(val *parser.Attribute) bool {
+func isBooleanOrStringTrue(val *parser.Attribute) bool {
 	switch val.Type() {
 	case cty.Bool:
 		return val.Value().True()


Test patch:
diff --git a/internal/app/tfsec/aws_acl_test.go b/internal/app/tfsec/aws_acl_test.go
index 400946690..3c44576cf 100644
--- a/internal/app/tfsec/aws_acl_test.go
+++ b/internal/app/tfsec/aws_acl_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -22,7 +22,7 @@ resource "aws_s3_bucket" "my-bucket" {
 	acl = "public-read"
 	logging {}
 }`,
-			mustIncludeResultCode: aws.AWSBadBucketACL,
+			mustIncludeResultCode: checks.AWSBadBucketACL,
 		},
 		{
 			name: "check aws_s3_bucket with acl=public-read-write",
@@ -31,7 +31,7 @@ resource "aws_s3_bucket" "my-bucket" {
 	acl = "public-read-write"
 	logging {}
 }`,
-			mustIncludeResultCode: aws.AWSBadBucketACL,
+			mustIncludeResultCode: checks.AWSBadBucketACL,
 		},
 		{
 			name: "check aws_s3_bucket with acl=website",
@@ -39,7 +39,7 @@ resource "aws_s3_bucket" "my-bucket" {
 resource "aws_s3_bucket" "my-bucket" {
 	acl = "website"
 }`,
-			mustIncludeResultCode: aws.AWSBadBucketACL,
+			mustIncludeResultCode: checks.AWSBadBucketACL,
 		},
 		{
 			name: "check aws_s3_bucket with acl=private",
@@ -47,7 +47,7 @@ resource "aws_s3_bucket" "my-bucket" {
 resource "aws_s3_bucket" "my-bucket" {
 	acl = "private"
 }`,
-			mustExcludeResultCode: aws.AWSBadBucketACL,
+			mustExcludeResultCode: checks.AWSBadBucketACL,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_api_gateway_domain_name_missing_security_policy_test.go b/internal/app/tfsec/aws_api_gateway_domain_name_missing_security_policy_test.go
index 4a2ba734d..ef09ba681 100644
--- a/internal/app/tfsec/aws_api_gateway_domain_name_missing_security_policy_test.go
+++ b/internal/app/tfsec/aws_api_gateway_domain_name_missing_security_policy_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSMissingSecurityPolicy(t *testing.T) {
 resource "aws_api_gateway_domain_name" "my-resource" {
 	security_policy = "TLS_1_0"
 }`,
-			mustIncludeResultCode: aws.AWSApiGatewayDomainNameOutdatedSecurityPolicy,
+			mustIncludeResultCode: checks.AWSApiGatewayDomainNameOutdatedSecurityPolicy,
 		},
 		{
 			name: "check aws_api_gateway_domain_name with empty security policy",
@@ -29,7 +29,7 @@ resource "aws_api_gateway_domain_name" "my-resource" {
 resource "aws_api_gateway_domain_name" "my-resource" {
 	security_policy = ""
 }`,
-			mustIncludeResultCode: aws.AWSApiGatewayDomainNameOutdatedSecurityPolicy,
+			mustIncludeResultCode: checks.AWSApiGatewayDomainNameOutdatedSecurityPolicy,
 		},
 		{
 			name: "check aws_api_gateway_domain_name without security policy",
@@ -37,7 +37,7 @@ resource "aws_api_gateway_domain_name" "my-resource" {
 resource "aws_api_gateway_domain_name" "my-resource" {
  domain=""
 }`,
-			mustIncludeResultCode: aws.AWSApiGatewayDomainNameOutdatedSecurityPolicy,
+			mustIncludeResultCode: checks.AWSApiGatewayDomainNameOutdatedSecurityPolicy,
 		},
 		{
 			name: "check aws_api_gateway_domain_name with ok policy",
@@ -45,7 +45,7 @@ resource "aws_api_gateway_domain_name" "my-resource" {
 resource "aws_api_gateway_domain_name" "my-resource" {
 	security_policy = "TLS_1_2"
 }`,
-			mustExcludeResultCode: aws.AWSApiGatewayDomainNameOutdatedSecurityPolicy,
+			mustExcludeResultCode: checks.AWSApiGatewayDomainNameOutdatedSecurityPolicy,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_bucket_logging_test.go b/internal/app/tfsec/aws_bucket_logging_test.go
index 3b4076845..2c4bbe0eb 100644
--- a/internal/app/tfsec/aws_bucket_logging_test.go
+++ b/internal/app/tfsec/aws_bucket_logging_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSBucketLogging(t *testing.T) {
 resource "aws_s3_bucket" "my-bucket" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSNoBucketLogging,
+			mustIncludeResultCode: checks.AWSNoBucketLogging,
 		},
 		{
 			name: "check bucket with logging enabled",
@@ -31,7 +31,7 @@ resource "aws_s3_bucket" "my-bucket" {
 		target_bucket = "target-bucket"
 	}
 }`,
-			mustExcludeResultCode: aws.AWSNoBucketLogging,
+			mustExcludeResultCode: checks.AWSNoBucketLogging,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_classic_test.go b/internal/app/tfsec/aws_classic_test.go
index 8a8eb5885..7aab8a127 100644
--- a/internal/app/tfsec/aws_classic_test.go
+++ b/internal/app/tfsec/aws_classic_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -18,22 +18,22 @@ func Test_AWSClassicUsage(t *testing.T) {
 		{
 			name:                  "check aws_db_security_group",
 			source:                `resource "aws_db_security_group" "my-group" {}`,
-			mustIncludeResultCode: aws.AWSClassicUsage,
+			mustIncludeResultCode: checks.AWSClassicUsage,
 		},
 		{
 			name:                  "check aws_redshift_security_group",
 			source:                `resource "aws_redshift_security_group" "my-group" {}`,
-			mustIncludeResultCode: aws.AWSClassicUsage,
+			mustIncludeResultCode: checks.AWSClassicUsage,
 		},
 		{
 			name:                  "check aws_elasticache_security_group",
 			source:                `resource "aws_elasticache_security_group" "my-group" {}`,
-			mustIncludeResultCode: aws.AWSClassicUsage,
+			mustIncludeResultCode: checks.AWSClassicUsage,
 		},
 		{
 			name:                  "check for false positives",
 			source:                `resource "my_resource" "my-resource" {}`,
-			mustExcludeResultCode: aws.AWSClassicUsage,
+			mustExcludeResultCode: checks.AWSClassicUsage,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_cloudfront_does_not_have_waf_test.go b/internal/app/tfsec/aws_cloudfront_does_not_have_waf_test.go
index 3204d74a6..bca7efc83 100644
--- a/internal/app/tfsec/aws_cloudfront_does_not_have_waf_test.go
+++ b/internal/app/tfsec/aws_cloudfront_does_not_have_waf_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -52,7 +52,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
     target_origin_id = "groupS3"
   }
 }`,
-			mustIncludeResultCode: aws.AWSCloudFrontDoesNotHaveAWaf,
+			mustIncludeResultCode: checks.AWSCloudFrontDoesNotHaveAWaf,
 		},
 		{
 			name: "check there is a waf web_acl_id for aws_cloudfront_distribution",
@@ -83,7 +83,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
 
   web_acl_id = "waf_id"
 }`,
-			mustExcludeResultCode: aws.AWSCloudFrontDoesNotHaveAWaf,
+			mustExcludeResultCode: checks.AWSCloudFrontDoesNotHaveAWaf,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_cloudfront_outdated_protocol_test.go b/internal/app/tfsec/aws_cloudfront_outdated_protocol_test.go
index 9c750219e..9a4cd9795 100644
--- a/internal/app/tfsec/aws_cloudfront_outdated_protocol_test.go
+++ b/internal/app/tfsec/aws_cloudfront_outdated_protocol_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -20,7 +20,7 @@ func Test_AWSCloudFrontOutdatedProtocol(t *testing.T) {
 resource "aws_cloudfront_distribution" "s3_distribution" {
 
 }`,
-			mustIncludeResultCode: aws.AWSCloudFrontOutdatedProtocol,
+			mustIncludeResultCode: checks.AWSCloudFrontOutdatedProtocol,
 		},
 		{
 			name: "check no default minimum_protocol_version attribute in viewer_certificate block",
@@ -30,7 +30,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
     cloudfront_default_certificate = true
   }
 }`,
-			mustIncludeResultCode: aws.AWSCloudFrontOutdatedProtocol,
+			mustIncludeResultCode: checks.AWSCloudFrontOutdatedProtocol,
 		},
 		{
 			name: "check TLSv1.2_2019 not used",
@@ -41,7 +41,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
 	minimum_protocol_version = "TLSv1.2_2018"
   }
 }`,
-			mustIncludeResultCode: aws.AWSCloudFrontOutdatedProtocol,
+			mustIncludeResultCode: checks.AWSCloudFrontOutdatedProtocol,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_http_test.go b/internal/app/tfsec/aws_http_test.go
index 2c96c0056..3ff6a307b 100644
--- a/internal/app/tfsec/aws_http_test.go
+++ b/internal/app/tfsec/aws_http_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,14 +21,14 @@ func Test_AWSPlainHTTP(t *testing.T) {
 resource "aws_alb_listener" "my-listener" {
 	protocol = "HTTP"
 }`,
-			mustIncludeResultCode: aws.AWSPlainHTTP,
+			mustIncludeResultCode: checks.AWSPlainHTTP,
 		},
 		{
 			name: "check aws_alb_listener using plain HTTP (via non specification)",
 			source: `
 resource "aws_alb_listener" "my-listener" {
 }`,
-			mustIncludeResultCode: aws.AWSPlainHTTP,
+			mustIncludeResultCode: checks.AWSPlainHTTP,
 		},
 		{
 			name: "check aws_alb_listener using HTTPS",
@@ -36,7 +36,7 @@ resource "aws_alb_listener" "my-listener" {
 resource "aws_alb_listener" "my-listener" {
 	protocol = "HTTPS"
 }`,
-			mustExcludeResultCode: aws.AWSPlainHTTP,
+			mustExcludeResultCode: checks.AWSPlainHTTP,
 		},
 		{
 			name: "check aws_alb_listener using HTTP as redirect to HTTPS",
@@ -53,7 +53,7 @@ resource "aws_alb_listener" "my-listener" {
 		}
 	}
 }`,
-			mustExcludeResultCode: aws.AWSPlainHTTP,
+			mustExcludeResultCode: checks.AWSPlainHTTP,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_iam_password_policy_checks_test.go b/internal/app/tfsec/aws_iam_password_policy_checks_test.go
index e1c75a571..48bda5be2 100644
--- a/internal/app/tfsec/aws_iam_password_policy_checks_test.go
+++ b/internal/app/tfsec/aws_iam_password_policy_checks_test.go
@@ -3,8 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
-
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -27,7 +26,7 @@ resource "aws_iam_account_password_policy" "strict" {
   require_symbols                = true
   allow_users_to_change_password = true
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordReusePrevention,
+			mustIncludeResultCode: checks.AWSIAMPasswordReusePrevention,
 		},
 		{
 			name: "check aws_iam_account_password_policy has password_reuse_prevention less than 5",
@@ -41,7 +40,7 @@ resource "aws_iam_account_password_policy" "strict" {
   allow_users_to_change_password = true
   password_reuse_prevention      = 4
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordReusePrevention,
+			mustIncludeResultCode: checks.AWSIAMPasswordReusePrevention,
 		},
 		{
 			name: "check aws_iam_account_password_policy has password_reuse_prevention greater than 5",
@@ -55,7 +54,7 @@ resource "aws_iam_account_password_policy" "strict" {
   allow_users_to_change_password = true
   password_reuse_prevention      = 5
 }`,
-			mustExcludeResultCode: aws.AWSIAMPasswordReusePrevention,
+			mustExcludeResultCode: checks.AWSIAMPasswordReusePrevention,
 		},
 	}
 
@@ -85,7 +84,7 @@ resource "aws_iam_account_password_policy" "strict" {
   require_symbols                = true
   allow_users_to_change_password = true
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordMinimumLength,
+			mustIncludeResultCode: checks.AWSIAMPasswordMinimumLength,
 		},
 		{
 			name: "check aws_iam_account_password_policy has minimum_password_length less than 14",
@@ -99,7 +98,7 @@ resource "aws_iam_account_password_policy" "strict" {
   allow_users_to_change_password = true
   password_reuse_prevention      = 4
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordMinimumLength,
+			mustIncludeResultCode: checks.AWSIAMPasswordMinimumLength,
 		},
 		{
 			name: "check aws_iam_account_password_policy has minimum_password_length greater than 14",
@@ -112,7 +111,7 @@ resource "aws_iam_account_password_policy" "strict" {
   require_symbols                = true
   allow_users_to_change_password = true
 }`,
-			mustExcludeResultCode: aws.AWSIAMPasswordMinimumLength,
+			mustExcludeResultCode: checks.AWSIAMPasswordMinimumLength,
 		},
 	}
 
@@ -137,7 +136,7 @@ func Test_AWSIamPasswordRequiresSymbol(t *testing.T) {
 			source: `
 resource "aws_iam_account_password_policy" "strict" {
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordRequiresSymbol,
+			mustIncludeResultCode: checks.AWSIAMPasswordRequiresSymbol,
 		},
 		{
 			name: "check aws_iam_account_password_policy require_symbols is set but not true",
@@ -145,7 +144,7 @@ resource "aws_iam_account_password_policy" "strict" {
 resource "aws_iam_account_password_policy" "strict" {
   require_symbols                = false
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordRequiresSymbol,
+			mustIncludeResultCode: checks.AWSIAMPasswordRequiresSymbol,
 		},
 		{
 			name: "check aws_iam_account_password_policy require_symbols is set to true",
@@ -153,7 +152,7 @@ resource "aws_iam_account_password_policy" "strict" {
 resource "aws_iam_account_password_policy" "strict" {
   require_symbols                = true
 }`,
-			mustExcludeResultCode: aws.AWSIAMPasswordRequiresSymbol,
+			mustExcludeResultCode: checks.AWSIAMPasswordRequiresSymbol,
 		},
 	}
 
@@ -178,7 +177,7 @@ func Test_AWSIamPasswordRequiresNumber(t *testing.T) {
 			source: `
 resource "aws_iam_account_password_policy" "strict" {
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordRequiresNumber,
+			mustIncludeResultCode: checks.AWSIAMPasswordRequiresNumber,
 		},
 		{
 			name: "check aws_iam_account_password_policy require_numbers is set but not true",
@@ -186,7 +185,7 @@ resource "aws_iam_account_password_policy" "strict" {
 resource "aws_iam_account_password_policy" "strict" {
   require_numbers                = false
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordRequiresNumber,
+			mustIncludeResultCode: checks.AWSIAMPasswordRequiresNumber,
 		},
 		{
 			name: "check aws_iam_account_password_policy require_numbers is set to true",
@@ -194,7 +193,7 @@ resource "aws_iam_account_password_policy" "strict" {
 resource "aws_iam_account_password_policy" "strict" {
   require_numbers                = true
 }`,
-			mustExcludeResultCode: aws.AWSIAMPasswordRequiresNumber,
+			mustExcludeResultCode: checks.AWSIAMPasswordRequiresNumber,
 		},
 	}
 
@@ -219,7 +218,7 @@ func Test_AWSIamPasswordRequiresUppercaseCharacter(t *testing.T) {
 			source: `
 resource "aws_iam_account_password_policy" "strict" {
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordRequiresUppercaseCharacter,
+			mustIncludeResultCode: checks.AWSIAMPasswordRequiresUppercaseCharacter,
 		},
 		{
 			name: "check aws_iam_account_password_policy require_uppercase_characters is set but not true",
@@ -227,7 +226,7 @@ resource "aws_iam_account_password_policy" "strict" {
 resource "aws_iam_account_password_policy" "strict" {
   require_uppercase_characters                = false
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordRequiresUppercaseCharacter,
+			mustIncludeResultCode: checks.AWSIAMPasswordRequiresUppercaseCharacter,
 		},
 		{
 			name: "check aws_iam_account_password_policy require_uppercase_characters is set to true",
@@ -235,7 +234,7 @@ resource "aws_iam_account_password_policy" "strict" {
 resource "aws_iam_account_password_policy" "strict" {
   require_uppercase_characters                = true
 }`,
-			mustExcludeResultCode: aws.AWSIAMPasswordRequiresUppercaseCharacter,
+			mustExcludeResultCode: checks.AWSIAMPasswordRequiresUppercaseCharacter,
 		},
 	}
 
@@ -260,7 +259,7 @@ func Test_AWSIamPasswordRequiresLowercaseCharacter(t *testing.T) {
 			source: `
 resource "aws_iam_account_password_policy" "strict" {
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordRequiresLowercaseCharacter,
+			mustIncludeResultCode: checks.AWSIAMPasswordRequiresLowercaseCharacter,
 		},
 		{
 			name: "check aws_iam_account_password_policy has require_lowercase_characters is set but not true",
@@ -268,7 +267,7 @@ resource "aws_iam_account_password_policy" "strict" {
 resource "aws_iam_account_password_policy" "strict" {
   require_lowercase_characters                = false
 }`,
-			mustIncludeResultCode: aws.AWSIAMPasswordRequiresLowercaseCharacter,
+			mustIncludeResultCode: checks.AWSIAMPasswordRequiresLowercaseCharacter,
 		},
 		{
 			name: "check aws_iam_account_password_policy has require_lowercase_characters is set to true",
@@ -276,7 +275,7 @@ resource "aws_iam_account_password_policy" "strict" {
 resource "aws_iam_account_password_policy" "strict" {
   require_lowercase_characters                = true
 }`,
-			mustExcludeResultCode: aws.AWSIAMPasswordRequiresLowercaseCharacter,
+			mustExcludeResultCode: checks.AWSIAMPasswordRequiresLowercaseCharacter,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_iam_policy_document_test.go b/internal/app/tfsec/aws_iam_policy_document_test.go
index 65d49a9f1..ee33b4dc0 100644
--- a/internal/app/tfsec/aws_iam_policy_document_test.go
+++ b/internal/app/tfsec/aws_iam_policy_document_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -28,7 +28,7 @@ data "aws_iam_policy_document" "my-policy" {
     	]
 	}
 }`,
-			mustExcludeResultCode: aws.AWSIamPolicyWildcardActions,
+			mustExcludeResultCode: checks.AWSIamPolicyWildcardActions,
 		},
 		{
 			name: "check aws_iam_policy_document has wildcard actions.",
@@ -43,7 +43,7 @@ data "aws_iam_policy_document" "my-policy" {
     	]
 	}
 }`,
-			mustIncludeResultCode: aws.AWSIamPolicyWildcardActions,
+			mustIncludeResultCode: checks.AWSIamPolicyWildcardActions,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_missing_description_for_security_group_test.go b/internal/app/tfsec/aws_missing_description_for_security_group_test.go
index 1264fd7bf..e031bc680 100644
--- a/internal/app/tfsec/aws_missing_description_for_security_group_test.go
+++ b/internal/app/tfsec/aws_missing_description_for_security_group_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSMissingDescriptionForSecurityGroup(t *testing.T) {
 resource "aws_security_group" "my-group" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSNoDescriptionInSecurityGroup,
+			mustIncludeResultCode: checks.AWSNoDescriptionInSecurityGroup,
 		},
 		{
 			name: "check aws_security_group_rule without description",
@@ -29,7 +29,7 @@ resource "aws_security_group" "my-group" {
 resource "aws_security_group_rule" "my-rule" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSNoDescriptionInSecurityGroup,
+			mustIncludeResultCode: checks.AWSNoDescriptionInSecurityGroup,
 		},
 		{
 			name: "check aws_security_group with description",
@@ -37,7 +37,7 @@ resource "aws_security_group_rule" "my-rule" {
 resource "aws_security_group" "my-group" {
 	description = "this is a group for allowing shiz"
 }`,
-			mustExcludeResultCode: aws.AWSNoDescriptionInSecurityGroup,
+			mustExcludeResultCode: checks.AWSNoDescriptionInSecurityGroup,
 		},
 		{
 			name: "check aws_security_group_rule with description",
@@ -45,7 +45,7 @@ resource "aws_security_group" "my-group" {
 resource "aws_security_group_rule" "my-rule" {
 	description = "this is a group for allowing shiz"
 }`,
-			mustExcludeResultCode: aws.AWSNoDescriptionInSecurityGroup,
+			mustExcludeResultCode: checks.AWSNoDescriptionInSecurityGroup,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_no_ecr_repository_scan_test.go b/internal/app/tfsec/aws_no_ecr_repository_scan_test.go
index e833946e4..3bdee66dc 100644
--- a/internal/app/tfsec/aws_no_ecr_repository_scan_test.go
+++ b/internal/app/tfsec/aws_no_ecr_repository_scan_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -17,7 +17,7 @@ func Test_AWSEcrImageScanNotEnabled(t *testing.T) {
 		{
 			name:                  "check ECR Image Scan disabled",
 			source:                `resource "aws_ecr_repository" "foo" {}`,
-			mustIncludeResultCode: aws.AWSEcrImageScanNotEnabled,
+			mustIncludeResultCode: checks.AWSEcrImageScanNotEnabled,
 		},
 		{
 			name: "check ECR Image Scan disabled",
@@ -30,7 +30,7 @@ resource "aws_ecr_repository" "foo" {
     scan_on_push = false
   }
 }`,
-			mustIncludeResultCode: aws.AWSEcrImageScanNotEnabled,
+			mustIncludeResultCode: checks.AWSEcrImageScanNotEnabled,
 		},
 		{
 			name: "check ECR Image Scan disabled",
@@ -43,7 +43,7 @@ resource "aws_ecr_repository" "foo" {
     scan_on_push = true
   }
 }`,
-			mustExcludeResultCode: aws.AWSEcrImageScanNotEnabled,
+			mustExcludeResultCode: checks.AWSEcrImageScanNotEnabled,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_no_kms_key_autorotate_test.go b/internal/app/tfsec/aws_no_kms_key_autorotate_test.go
index 742af26f6..344d44b52 100644
--- a/internal/app/tfsec/aws_no_kms_key_autorotate_test.go
+++ b/internal/app/tfsec/aws_no_kms_key_autorotate_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -17,7 +17,7 @@ func Test_AWSNoKmsKeyAutoRotate(t *testing.T) {
 		{
 			name:                  "check KMS Key with auto-rotation not set",
 			source:                `resource "aws_kms_key" "kms_key" {}`,
-			mustIncludeResultCode: aws.AWSNoKMSAutoRotate,
+			mustIncludeResultCode: checks.AWSNoKMSAutoRotate,
 		},
 		{
 			name: "check KMS Key with auto-rotation disabled",
@@ -25,7 +25,7 @@ func Test_AWSNoKmsKeyAutoRotate(t *testing.T) {
 resource "aws_kms_key" "kms_key" {
 	enable_key_rotation = false
 }`,
-			mustIncludeResultCode: aws.AWSNoKMSAutoRotate,
+			mustIncludeResultCode: checks.AWSNoKMSAutoRotate,
 		},
 		{
 			name: "check KMS Key with auto-rotation enabled",
@@ -33,7 +33,7 @@ resource "aws_kms_key" "kms_key" {
 resource "aws_kms_key" "kms_key" {
 	enable_key_rotation = true
 }`,
-			mustExcludeResultCode: aws.AWSNoKMSAutoRotate,
+			mustExcludeResultCode: checks.AWSNoKMSAutoRotate,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_not_internal_test.go b/internal/app/tfsec/aws_not_internal_test.go
index 6f2744ed9..73c4e6206 100644
--- a/internal/app/tfsec/aws_not_internal_test.go
+++ b/internal/app/tfsec/aws_not_internal_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSNotInternal(t *testing.T) {
 resource "aws_alb" "my-resource" {
 	internal = false
 }`,
-			mustIncludeResultCode: aws.AWSExternallyExposedLoadBalancer,
+			mustIncludeResultCode: checks.AWSExternallyExposedLoadBalancer,
 		},
 		{
 			name: "check aws_elb when not internal",
@@ -29,7 +29,7 @@ resource "aws_alb" "my-resource" {
 resource "aws_elb" "my-resource" {
 	internal = false
 }`,
-			mustIncludeResultCode: aws.AWSExternallyExposedLoadBalancer,
+			mustIncludeResultCode: checks.AWSExternallyExposedLoadBalancer,
 		},
 		{
 			name: "check aws_lb when not internal",
@@ -37,14 +37,14 @@ resource "aws_elb" "my-resource" {
 resource "aws_lb" "my-resource" {
 	internal = false
 }`,
-			mustIncludeResultCode: aws.AWSExternallyExposedLoadBalancer,
+			mustIncludeResultCode: checks.AWSExternallyExposedLoadBalancer,
 		},
 		{
 			name: "check aws_lb when not explicitly marked as internal",
 			source: `
 resource "aws_lb" "my-resource" {
 }`,
-			mustIncludeResultCode: aws.AWSExternallyExposedLoadBalancer,
+			mustIncludeResultCode: checks.AWSExternallyExposedLoadBalancer,
 		},
 		{
 			name: "check aws_lb when explicitly marked as internal",
@@ -52,7 +52,7 @@ resource "aws_lb" "my-resource" {
 resource "aws_lb" "my-resource" {
 	internal = true
 }`,
-			mustExcludeResultCode: aws.AWSExternallyExposedLoadBalancer,
+			mustExcludeResultCode: checks.AWSExternallyExposedLoadBalancer,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_open_security_group_rule_test.go b/internal/app/tfsec/aws_open_security_group_rule_test.go
index 7da4e363c..c696fe236 100644
--- a/internal/app/tfsec/aws_open_security_group_rule_test.go
+++ b/internal/app/tfsec/aws_open_security_group_rule_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -22,7 +22,7 @@ resource "aws_security_group_rule" "my-rule" {
 	type = "ingress"
 	cidr_blocks = ["0.0.0.0/0"]
 }`,
-			mustIncludeResultCode: aws.AWSOpenIngressSecurityGroupRule,
+			mustIncludeResultCode: checks.AWSOpenIngressSecurityGroupRule,
 		},
 		{
 			name: "check aws_security_group_rule egress on 0.0.0.0/0",
@@ -31,7 +31,7 @@ resource "aws_security_group_rule" "my-rule" {
 	type = "egress"
 	cidr_blocks = ["0.0.0.0/0"]
 }`,
-			mustIncludeResultCode: aws.AWSOpenEgressSecurityGroupRule,
+			mustIncludeResultCode: checks.AWSOpenEgressSecurityGroupRule,
 		},
 		{
 			name: "check aws_security_group_rule egress on 0.0.0.0/0 in list",
@@ -40,7 +40,7 @@ resource "aws_security_group_rule" "my-rule" {
 	type = "egress"
 	cidr_blocks = ["10.0.0.0/16", "0.0.0.0/0"]
 }`,
-			mustIncludeResultCode: aws.AWSOpenEgressSecurityGroupRule,
+			mustIncludeResultCode: checks.AWSOpenEgressSecurityGroupRule,
 		},
 		{
 			name: "check aws_security_group_rule egress on 10.0.0.0/16",
@@ -49,7 +49,7 @@ resource "aws_security_group_rule" "my-rule" {
 	type = "egress"
 	cidr_blocks = ["10.0.0.0/16"]
 }`,
-			mustExcludeResultCode: aws.AWSOpenEgressSecurityGroupRule,
+			mustExcludeResultCode: checks.AWSOpenEgressSecurityGroupRule,
 		},
 		{
 			name: "check variable containing 0.0.0.0/0",
@@ -70,7 +70,7 @@ variable "blocks" {
 }
 
 `,
-			mustIncludeResultCode: aws.AWSOpenIngressSecurityGroupRule,
+			mustIncludeResultCode: checks.AWSOpenIngressSecurityGroupRule,
 		},
 		{
 			name: "check aws_security_group_rule ingress on ::/0",
@@ -79,7 +79,7 @@ resource "aws_security_group_rule" "my-rule" {
 	type = "ingress"
 	ipv6_cidr_blocks = ["::/0"]
 }`,
-			mustIncludeResultCode: aws.AWSOpenIngressSecurityGroupRule,
+			mustIncludeResultCode: checks.AWSOpenIngressSecurityGroupRule,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_open_security_group_test.go b/internal/app/tfsec/aws_open_security_group_test.go
index c959ac06e..f9dada50b 100644
--- a/internal/app/tfsec/aws_open_security_group_test.go
+++ b/internal/app/tfsec/aws_open_security_group_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -23,7 +23,7 @@ func Test_AWSOpenSecurityGroup(t *testing.T) {
 				cidr_blocks = ["0.0.0.0/0"]
 			}
 		}`,
-			mustIncludeResultCode: aws.AWSOpenIngressSecurityGroupInlineRule,
+			mustIncludeResultCode: checks.AWSOpenIngressSecurityGroupInlineRule,
 		},
 		{
 			name: "check aws_security_group egress on 0.0.0.0/0",
@@ -33,7 +33,7 @@ func Test_AWSOpenSecurityGroup(t *testing.T) {
 				cidr_blocks = ["0.0.0.0/0"]
 			}
 		}`,
-			mustIncludeResultCode: aws.AWSOpenEgressSecurityGroupInlineRule,
+			mustIncludeResultCode: checks.AWSOpenEgressSecurityGroupInlineRule,
 		},
 		{
 			name: "check aws_security_group egress on 0.0.0.0/0 in list",
@@ -43,7 +43,7 @@ func Test_AWSOpenSecurityGroup(t *testing.T) {
 				cidr_blocks = ["10.0.0.0/16", "0.0.0.0/0"]
 			}
 		}`,
-			mustIncludeResultCode: aws.AWSOpenEgressSecurityGroupInlineRule,
+			mustIncludeResultCode: checks.AWSOpenEgressSecurityGroupInlineRule,
 		},
 		{
 			name: "check aws_security_group egress on 10.0.0.0/16",
@@ -53,7 +53,7 @@ func Test_AWSOpenSecurityGroup(t *testing.T) {
 				cidr_blocks = ["10.0.0.0/16"]
 			}
 		}`,
-			mustExcludeResultCode: aws.AWSOpenEgressSecurityGroupInlineRule,
+			mustExcludeResultCode: checks.AWSOpenEgressSecurityGroupInlineRule,
 		},
 		{
 			name: "check dynamic blocks using for_each",
@@ -101,7 +101,7 @@ func Test_AWSOpenSecurityGroup(t *testing.T) {
 		 }
 		}
 					`,
-			mustIncludeResultCode: aws.AWSOpenIngressSecurityGroupInlineRule,
+			mustIncludeResultCode: checks.AWSOpenIngressSecurityGroupInlineRule,
 		},
 		{
 			name: "check aws_security_group multiple ingress on 0.0.0.0/0",
@@ -114,7 +114,7 @@ func Test_AWSOpenSecurityGroup(t *testing.T) {
 				cidr_blocks = ["0.0.0.0/0"]
 			}
 		}`,
-			mustIncludeResultCode: aws.AWSOpenIngressSecurityGroupInlineRule,
+			mustIncludeResultCode: checks.AWSOpenIngressSecurityGroupInlineRule,
 		},
 		{
 			name: "check dynamic values for cidr_blocks",
@@ -140,7 +140,7 @@ variable "cidr_2" {
   default = ["1.1.1.1/32"]
 }
 `,
-			mustIncludeResultCode: aws.AWSOpenEgressSecurityGroupInlineRule,
+			mustIncludeResultCode: checks.AWSOpenEgressSecurityGroupInlineRule,
 		},
 		{
 			name: "check aws_security_group ingress on ::/0",
@@ -150,7 +150,7 @@ variable "cidr_2" {
 				ipv6_cidr_blocks = ["0.0.0.0/0"]
 			}
 		}`,
-			mustIncludeResultCode: aws.AWSOpenIngressSecurityGroupInlineRule,
+			mustIncludeResultCode: checks.AWSOpenIngressSecurityGroupInlineRule,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_outdated_ssl_test.go b/internal/app/tfsec/aws_outdated_ssl_test.go
index 93d782cc7..ba82bd948 100644
--- a/internal/app/tfsec/aws_outdated_ssl_test.go
+++ b/internal/app/tfsec/aws_outdated_ssl_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -22,7 +22,7 @@ resource "aws_alb_listener" "my-resource" {
 	ssl_policy = "ELBSecurityPolicy-TLS-1-1-2017-01"
 	protocol = "HTTPS"
 }`,
-			mustIncludeResultCode: aws.AWSOutdatedSSLPolicy,
+			mustIncludeResultCode: checks.AWSOutdatedSSLPolicy,
 		},
 		{
 			name: "check aws_lb_listener with outdated policy",
@@ -31,7 +31,7 @@ resource "aws_lb_listener" "my-resource" {
 	ssl_policy = "ELBSecurityPolicy-TLS-1-1-2017-01"
 	protocol = "HTTPS"
 }`,
-			mustIncludeResultCode: aws.AWSOutdatedSSLPolicy,
+			mustIncludeResultCode: checks.AWSOutdatedSSLPolicy,
 		},
 		{
 			name: "check aws_alb_listener with ok policy",
@@ -40,7 +40,7 @@ resource "aws_alb_listener" "my-resource" {
 	ssl_policy = "ELBSecurityPolicy-TLS-1-2-2017-01"
 	protocol = "HTTPS"
 }`,
-			mustExcludeResultCode: aws.AWSOutdatedSSLPolicy,
+			mustExcludeResultCode: checks.AWSOutdatedSSLPolicy,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_outdated_tls_policy_elasticsearch_domain_endpoint_test.go b/internal/app/tfsec/aws_outdated_tls_policy_elasticsearch_domain_endpoint_test.go
index a2ac364be..2581eba86 100644
--- a/internal/app/tfsec/aws_outdated_tls_policy_elasticsearch_domain_endpoint_test.go
+++ b/internal/app/tfsec/aws_outdated_tls_policy_elasticsearch_domain_endpoint_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSOutdatedTLSPolicyElasticsearchDomainEndpoint(t *testing.T) {
 resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
 	
 }`,
-			mustExcludeResultCode: aws.AWSOutdatedTLSPolicyElasticsearchDomainEndpoint,
+			mustExcludeResultCode: checks.AWSOutdatedTLSPolicyElasticsearchDomainEndpoint,
 		},
 		{
 			name: "check tls_security_policy for aws_elasticsearch_domain isn't the default",
@@ -33,7 +33,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
     enforce_https = true
   }
 }`,
-			mustIncludeResultCode: aws.AWSOutdatedTLSPolicyElasticsearchDomainEndpoint,
+			mustIncludeResultCode: checks.AWSOutdatedTLSPolicyElasticsearchDomainEndpoint,
 		},
 		{
 			name: "check tls_security_policy isn't set to TLsv1.0 for aws_elasticsearch_domain",
@@ -46,7 +46,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
     tls_security_policy = "Policy-Min-TLS-1-0-2019-07"
   }
 }`,
-			mustIncludeResultCode: aws.AWSOutdatedTLSPolicyElasticsearchDomainEndpoint,
+			mustIncludeResultCode: checks.AWSOutdatedTLSPolicyElasticsearchDomainEndpoint,
 		},
 		{
 			name: "check tls_security_policy is set to TLSv1.2 for aws_elasticsearch_domain",
@@ -59,7 +59,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
     tls_security_policy = "Policy-Min-TLS-1-2-2019-07"
   }
 }`,
-			mustExcludeResultCode: aws.AWSOutdatedTLSPolicyElasticsearchDomainEndpoint,
+			mustExcludeResultCode: checks.AWSOutdatedTLSPolicyElasticsearchDomainEndpoint,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_plaintext_node_to_node_elasticsearch_traffic_test.go b/internal/app/tfsec/aws_plaintext_node_to_node_elasticsearch_traffic_test.go
index 0c06e26d0..a9eabce69 100644
--- a/internal/app/tfsec/aws_plaintext_node_to_node_elasticsearch_traffic_test.go
+++ b/internal/app/tfsec/aws_plaintext_node_to_node_elasticsearch_traffic_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSPlaintextNodeToNodeElasticsearchTraffic(t *testing.T) {
 resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSPlaintextNodeToNodeElasticsearchTraffic,
+			mustIncludeResultCode: checks.AWSPlaintextNodeToNodeElasticsearchTraffic,
 		},
 		{
 			name: "check false enabled attr aws_elasticsearch_domain",
@@ -33,7 +33,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
     enabled = false
   }
 }`,
-			mustIncludeResultCode: aws.AWSPlaintextNodeToNodeElasticsearchTraffic,
+			mustIncludeResultCode: checks.AWSPlaintextNodeToNodeElasticsearchTraffic,
 		},
 		{
 			name: "check true enabled attr aws_elasticsearch_domain",
@@ -45,7 +45,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
     enabled = true
   }
 }`,
-			mustExcludeResultCode: aws.AWSPlaintextNodeToNodeElasticsearchTraffic,
+			mustExcludeResultCode: checks.AWSPlaintextNodeToNodeElasticsearchTraffic,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_provider_test.go b/internal/app/tfsec/aws_provider_test.go
index 4a11a1097..caa3c0ef2 100644
--- a/internal/app/tfsec/aws_provider_test.go
+++ b/internal/app/tfsec/aws_provider_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSProviderHasAccessCredentials(t *testing.T) {
 provider "aws" {
   access_key = "abcd1234"
 }`,
-			mustIncludeResultCode: aws.AWSProviderHasAccessCredentials,
+			mustIncludeResultCode: checks.AWSProviderHasAccessCredentials,
 		},
 		{
 			name: "check aws provider has secret key specified",
@@ -29,7 +29,7 @@ provider "aws" {
 provider "aws" {
   secret_key = "abcd1234"
 }`,
-			mustIncludeResultCode: aws.AWSProviderHasAccessCredentials,
+			mustIncludeResultCode: checks.AWSProviderHasAccessCredentials,
 		},
 		{
 			name: "check aws provider has both access and secret key specified",
@@ -38,14 +38,14 @@ provider "aws" {
   access_key = "abcd1234"
   secret_key = "abcd1234"
 }`,
-			mustIncludeResultCode: aws.AWSProviderHasAccessCredentials,
+			mustIncludeResultCode: checks.AWSProviderHasAccessCredentials,
 		},
 		{
 			name: "check aws provider has neither access or secret key specified",
 			source: `
 provider "aws" {
 }`,
-			mustExcludeResultCode: aws.AWSProviderHasAccessCredentials,
+			mustExcludeResultCode: checks.AWSProviderHasAccessCredentials,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_public_ip_test.go b/internal/app/tfsec/aws_public_ip_test.go
index ffe5da962..4524231eb 100644
--- a/internal/app/tfsec/aws_public_ip_test.go
+++ b/internal/app/tfsec/aws_public_ip_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSPublicIP(t *testing.T) {
 resource "aws_launch_configuration" "my-resource" {
 	associate_public_ip_address = true
 }`,
-			mustIncludeResultCode: aws.AWSResourceHasPublicIP,
+			mustIncludeResultCode: checks.AWSResourceHasPublicIP,
 		},
 		{
 			name: "check aws_instance with public ip associated",
@@ -29,7 +29,7 @@ resource "aws_launch_configuration" "my-resource" {
 resource "aws_instance" "my-resource" {
 	associate_public_ip_address = true
 }`,
-			mustIncludeResultCode: aws.AWSResourceHasPublicIP,
+			mustIncludeResultCode: checks.AWSResourceHasPublicIP,
 		},
 		{
 			name: "check aws_instance without public ip associated",
@@ -37,14 +37,14 @@ resource "aws_instance" "my-resource" {
 resource "aws_instance" "my-resource" {
 	associate_public_ip_address = false
 }`,
-			mustExcludeResultCode: aws.AWSResourceHasPublicIP,
+			mustExcludeResultCode: checks.AWSResourceHasPublicIP,
 		},
 		{
 			name: "check aws_instance without public ip explicitly associated",
 			source: `
 resource "aws_instance" "my-resource" {
 }`,
-			mustExcludeResultCode: aws.AWSResourceHasPublicIP,
+			mustExcludeResultCode: checks.AWSResourceHasPublicIP,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_public_test.go b/internal/app/tfsec/aws_public_test.go
index 90ca53133..d49ff5b04 100644
--- a/internal/app/tfsec/aws_public_test.go
+++ b/internal/app/tfsec/aws_public_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSPublic(t *testing.T) {
 resource "aws_db_instance" "my-resource" {
 	publicly_accessible = true
 }`,
-			mustIncludeResultCode: aws.AWSPubliclyAccessibleResource,
+			mustIncludeResultCode: checks.AWSPubliclyAccessibleResource,
 		},
 		{
 			name: "check aws_dms_replication_instance when publicly exposed",
@@ -29,7 +29,7 @@ resource "aws_db_instance" "my-resource" {
 resource "aws_dms_replication_instance" "my-resource" {
 	publicly_accessible = true
 }`,
-			mustIncludeResultCode: aws.AWSPubliclyAccessibleResource,
+			mustIncludeResultCode: checks.AWSPubliclyAccessibleResource,
 		},
 		{
 			name: "check aws_rds_cluster_instance when publicly exposed",
@@ -37,7 +37,7 @@ resource "aws_dms_replication_instance" "my-resource" {
 resource "aws_rds_cluster_instance" "my-resource" {
 	publicly_accessible = true
 }`,
-			mustIncludeResultCode: aws.AWSPubliclyAccessibleResource,
+			mustIncludeResultCode: checks.AWSPubliclyAccessibleResource,
 		},
 		{
 			name: "check aws_redshift_cluster when publicly exposed",
@@ -45,7 +45,7 @@ resource "aws_rds_cluster_instance" "my-resource" {
 resource "aws_redshift_cluster" "my-resource" {
 	publicly_accessible = true
 }`,
-			mustIncludeResultCode: aws.AWSPubliclyAccessibleResource,
+			mustIncludeResultCode: checks.AWSPubliclyAccessibleResource,
 		},
 		{
 			name: "check aws_redshift_cluster when not publicly exposed",
@@ -53,7 +53,7 @@ resource "aws_redshift_cluster" "my-resource" {
 resource "aws_redshift_cluster" "my-resource" {
 	publicly_accessible = false
 }`,
-			mustExcludeResultCode: aws.AWSPubliclyAccessibleResource,
+			mustExcludeResultCode: checks.AWSPubliclyAccessibleResource,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_task_definition_includes_sensitive_data_test.go b/internal/app/tfsec/aws_task_definition_includes_sensitive_data_test.go
index 8765ccacc..a140edbac 100644
--- a/internal/app/tfsec/aws_task_definition_includes_sensitive_data_test.go
+++ b/internal/app/tfsec/aws_task_definition_includes_sensitive_data_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -34,7 +34,7 @@ resource "aws_ecs_task_definition" "my-task" {
 EOF
 
 }`,
-			mustIncludeResultCode: aws.AWSTaskDefinitionWithSensitiveEnvironmentVariables,
+			mustIncludeResultCode: checks.AWSTaskDefinitionWithSensitiveEnvironmentVariables,
 		},
 		{
 			name: "check aws_ecs_task_definition when sensitive env vars are not included",
@@ -55,7 +55,7 @@ resource "aws_ecs_task_definition" "my-task" {
 EOF
 
 }`,
-			mustExcludeResultCode: aws.AWSTaskDefinitionWithSensitiveEnvironmentVariables,
+			mustExcludeResultCode: checks.AWSTaskDefinitionWithSensitiveEnvironmentVariables,
 		},
 		{
 			name: "check aws_ecs_task_definition when sensitive env vars are included but ignored",
@@ -77,7 +77,7 @@ resource "aws_ecs_task_definition" "my-task" {
 EOF
 
 }`,
-			mustExcludeResultCode: aws.AWSTaskDefinitionWithSensitiveEnvironmentVariables,
+			mustExcludeResultCode: checks.AWSTaskDefinitionWithSensitiveEnvironmentVariables,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_at_rest_elasticache_replication_group_test.go b/internal/app/tfsec/aws_unencrypted_at_rest_elasticache_replication_group_test.go
index d112a04c4..0d249fb07 100644
--- a/internal/app/tfsec/aws_unencrypted_at_rest_elasticache_replication_group_test.go
+++ b/internal/app/tfsec/aws_unencrypted_at_rest_elasticache_replication_group_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ resource "aws_elasticache_replication_group" "my-resource" {
         replication_group_id = "foo"
         replication_group_description = "my foo cluster"
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedAtRestElasticacheReplicationGroup,
+			mustIncludeResultCode: checks.AWSUnencryptedAtRestElasticacheReplicationGroup,
 		},
 		{
 			name: "check aws_elasticache_replication_group with at_rest_encryption_enabled",
@@ -32,7 +32,7 @@ resource "aws_elasticache_replication_group" "my-resource" {
 
         at_rest_encryption_enabled = true
 }`,
-			mustExcludeResultCode: aws.AWSUnencryptedAtRestElasticacheReplicationGroup,
+			mustExcludeResultCode: checks.AWSUnencryptedAtRestElasticacheReplicationGroup,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_block_device_test.go b/internal/app/tfsec/aws_unencrypted_block_device_test.go
index 44b725130..c75769bdd 100644
--- a/internal/app/tfsec/aws_unencrypted_block_device_test.go
+++ b/internal/app/tfsec/aws_unencrypted_block_device_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSUnencryptedBlockDevice(t *testing.T) {
 resource "aws_launch_configuration" "my-launch-config" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustIncludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check no encryption configured for ebs_block_device",
@@ -29,7 +29,7 @@ resource "aws_launch_configuration" "my-launch-config" {
 resource "aws_launch_configuration" "my-launch-config" {
 	root_block_device {}
 }`,
-			mustIncludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustIncludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check no encryption configured for ebs_block_device",
@@ -40,7 +40,7 @@ resource "aws_launch_configuration" "my-launch-config" {
 	}
 	ebs_block_device {}
 }`,
-			mustIncludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustIncludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check encryption disabled for root_block_device",
@@ -50,7 +50,7 @@ resource "aws_launch_configuration" "my-launch-config" {
 		encrypted = false
 	}
 }`,
-			mustIncludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustIncludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check encryption disabled for ebs_block_device",
@@ -63,7 +63,7 @@ resource "aws_launch_configuration" "my-launch-config" {
 		encrypted = false
 	}
 }`,
-			mustIncludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustIncludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check encryption enabled for root_block_device",
@@ -73,7 +73,7 @@ resource "aws_launch_configuration" "my-launch-config" {
 		encrypted = true
 	}
 }`,
-			mustExcludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustExcludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check encryption enabled for root_block_device and ebs_block_device",
@@ -86,7 +86,7 @@ resource "aws_launch_configuration" "my-launch-config" {
 		encrypted = true
 	}
 }`,
-			mustExcludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustExcludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check encryption enabled by default for root_block_device",
@@ -100,7 +100,7 @@ resource "aws_launch_configuration" "my-launch-config" {
 
 	}
 }`,
-			mustExcludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustExcludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check encryption enabled by default for non-specified root_block_device",
@@ -112,7 +112,7 @@ resource "aws_ebs_encryption_by_default" "example" {
 resource "aws_launch_configuration" "my-launch-config" {
 
 }`,
-			mustExcludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustExcludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check encryption enabled by default for non-specified root_block_device and ebs_block_device",
@@ -124,7 +124,7 @@ resource "aws_ebs_encryption_by_default" "example" {
 resource "aws_launch_configuration" "my-launch-config" {
 	ebs_block_device{}
 }`,
-			mustExcludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustExcludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 		{
 			name: "check encryption enabled for one ebs_block_device and not for another",
@@ -140,7 +140,7 @@ resource "aws_launch_configuration" "my-launch-config" {
 		encrypted  = false
 	}
 }`,
-			mustIncludeResultCode: aws.AWSLaunchConfigurationWithUnencryptedBlockDevice,
+			mustIncludeResultCode: checks.AWSLaunchConfigurationWithUnencryptedBlockDevice,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_cloudfront_communications_test.go b/internal/app/tfsec/aws_unencrypted_cloudfront_communications_test.go
index 6922358f5..fddcf6315 100644
--- a/internal/app/tfsec/aws_unencrypted_cloudfront_communications_test.go
+++ b/internal/app/tfsec/aws_unencrypted_cloudfront_communications_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -20,7 +20,7 @@ func Test_AWSUnencryptedCloudFrontCommunications(t *testing.T) {
 resource "aws_cloudfront_distribution" "s3_distribution" {
 
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedCloudFrontCommunications,
+			mustIncludeResultCode: checks.AWSUnencryptedCloudFrontCommunications,
 		},
 		{
 			name: "check no default viewer_protocol_policy in default_cache_behavior",
@@ -30,7 +30,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
 
 	  }
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedCloudFrontCommunications,
+			mustIncludeResultCode: checks.AWSUnencryptedCloudFrontCommunications,
 		},
 		{
 			name: "check viewer_protocol_policy include allows-all",
@@ -40,7 +40,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
 	    viewer_protocol_policy = "allow-all"
 	  }
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedCloudFrontCommunications,
+			mustIncludeResultCode: checks.AWSUnencryptedCloudFrontCommunications,
 		},
 		{
 			name: "check no viewer_protocol_policy in ordered_cache_behavior",
@@ -55,7 +55,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
 
 	}
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedCloudFrontCommunications,
+			mustIncludeResultCode: checks.AWSUnencryptedCloudFrontCommunications,
 		},
 		{
 			name: "check for allow-all in viewer_protocol_policy in orderd_cache_behavior ",
@@ -70,7 +70,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
 		viewer_protocol_policy = "allow-all"
 	}
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedCloudFrontCommunications,
+			mustIncludeResultCode: checks.AWSUnencryptedCloudFrontCommunications,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_elasticearch_domain_test.go b/internal/app/tfsec/aws_unencrypted_elasticearch_domain_test.go
index 3606fc9fe..02f1773ae 100644
--- a/internal/app/tfsec/aws_unencrypted_elasticearch_domain_test.go
+++ b/internal/app/tfsec/aws_unencrypted_elasticearch_domain_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func TestAWSUnencryptedElasticsearchDomain(t *testing.T) {
 resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedElasticsearchDomain,
+			mustIncludeResultCode: checks.AWSUnencryptedElasticsearchDomain,
 		},
 		{
 			name: "check false enabled attr aws_elasticsearch_domain",
@@ -31,7 +31,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
 
   encrypt_at_rest { }
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedElasticsearchDomain,
+			mustIncludeResultCode: checks.AWSUnencryptedElasticsearchDomain,
 		},
 		{
 			name: "check true enabled attr aws_elasticsearch_domain",
@@ -43,7 +43,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
     enabled = true
   }
 }`,
-			mustExcludeResultCode: aws.AWSUnencryptedElasticsearchDomain,
+			mustExcludeResultCode: checks.AWSUnencryptedElasticsearchDomain,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_in_transit_elasticache_replication_group_test.go b/internal/app/tfsec/aws_unencrypted_in_transit_elasticache_replication_group_test.go
index 8857e68a7..225c56743 100644
--- a/internal/app/tfsec/aws_unencrypted_in_transit_elasticache_replication_group_test.go
+++ b/internal/app/tfsec/aws_unencrypted_in_transit_elasticache_replication_group_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ resource "aws_elasticache_replication_group" "my-resource" {
         replication_group_id = "foo"
         replication_group_description = "my foo cluster"
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedInTransitElasticacheReplicationGroup,
+			mustIncludeResultCode: checks.AWSUnencryptedInTransitElasticacheReplicationGroup,
 		},
 		{
 			name: "check aws_elasticache_replication_group with transit_encryption_enabled",
@@ -32,7 +32,7 @@ resource "aws_elasticache_replication_group" "my-resource" {
 
         transit_encryption_enabled = true
 }`,
-			mustExcludeResultCode: aws.AWSUnencryptedInTransitElasticacheReplicationGroup,
+			mustExcludeResultCode: checks.AWSUnencryptedInTransitElasticacheReplicationGroup,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_kinesis_streams_test.go b/internal/app/tfsec/aws_unencrypted_kinesis_streams_test.go
index 63835228a..c323c232a 100644
--- a/internal/app/tfsec/aws_unencrypted_kinesis_streams_test.go
+++ b/internal/app/tfsec/aws_unencrypted_kinesis_streams_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSUnencryptedKinesisStream(t *testing.T) {
 resource "aws_kinesis_stream" "test_stream" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedKinesisStream,
+			mustIncludeResultCode: checks.AWSUnencryptedKinesisStream,
 		},
 		{
 			name: "check blank encryption key id specified for aws_sqs_queue",
@@ -29,7 +29,7 @@ resource "aws_kinesis_stream" "test_stream" {
 resource "aws_kinesis_stream" "test_stream" {
 	encryption_type = "NONE"
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedKinesisStream,
+			mustIncludeResultCode: checks.AWSUnencryptedKinesisStream,
 		},
 		{
 			name: "check encryption key id specified for aws_sqs_queue",
@@ -37,7 +37,7 @@ resource "aws_kinesis_stream" "test_stream" {
 resource "aws_kinesis_stream" "test_stream" {
 	encryption_type = "KMS"
 }`,
-			mustExcludeResultCode: aws.AWSUnencryptedKinesisStream,
+			mustExcludeResultCode: checks.AWSUnencryptedKinesisStream,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_msk_broker_transit_test.go b/internal/app/tfsec/aws_unencrypted_msk_broker_transit_test.go
index f506c990e..bb60c24f4 100644
--- a/internal/app/tfsec/aws_unencrypted_msk_broker_transit_test.go
+++ b/internal/app/tfsec/aws_unencrypted_msk_broker_transit_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -17,7 +17,7 @@ func Test_AWSUnencryptedMSKBroker(t *testing.T) {
 		{
 			name:                  "check MSK broker with encryption_info not set",
 			source:                `resource "aws_msk_cluster" "msk-cluster" {}`,
-			mustIncludeResultCode: aws.AWSUnencryptedMSKBroker,
+			mustIncludeResultCode: checks.AWSUnencryptedMSKBroker,
 		},
 		{
 			name: "check MSK broker with encryption_in_transit not set",
@@ -30,7 +30,7 @@ resource "aws_msk_cluster" "msk-cluster" {
 		}
 	}
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedMSKBroker,
+			mustIncludeResultCode: checks.AWSUnencryptedMSKBroker,
 		},
 		{
 			name: "check MSK broker with client_broker not set",
@@ -41,7 +41,7 @@ resource "aws_msk_cluster" "msk-cluster" {
 		}
 	}
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedMSKBroker,
+			mustIncludeResultCode: checks.AWSUnencryptedMSKBroker,
 		},
 		{
 			name: "check MSK broker with client_broker set to PLAINTEXT",
@@ -53,7 +53,7 @@ resource "aws_msk_cluster" "msk-cluster" {
 		}
 	}
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedMSKBroker,
+			mustIncludeResultCode: checks.AWSUnencryptedMSKBroker,
 		},
 		{
 			name: "check MSK broker with client_broker set to TLS_PLAINTEXT",
@@ -65,7 +65,7 @@ resource "aws_msk_cluster" "msk-cluster" {
 		}
 	}
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedMSKBroker,
+			mustIncludeResultCode: checks.AWSUnencryptedMSKBroker,
 		},
 		{
 			name: "check MSK broker with client_broker set to TLS",
@@ -77,7 +77,7 @@ resource "aws_msk_cluster" "msk-cluster" {
 		}
 	}
 }`,
-			mustExcludeResultCode: aws.AWSUnencryptedMSKBroker,
+			mustExcludeResultCode: checks.AWSUnencryptedMSKBroker,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_s3_bucket_test.go b/internal/app/tfsec/aws_unencrypted_s3_bucket_test.go
index 90bce46bd..e2668f760 100644
--- a/internal/app/tfsec/aws_unencrypted_s3_bucket_test.go
+++ b/internal/app/tfsec/aws_unencrypted_s3_bucket_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSUnencryptedS3Bucket(t *testing.T) {
 resource "aws_s3_bucket" "my-bucket" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedS3Bucket,
+			mustIncludeResultCode: checks.AWSUnencryptedS3Bucket,
 		},
 		{
 			name: "check no server_side_encryption_configuration aws_s3_bucket",
@@ -38,7 +38,7 @@ resource "aws_s3_bucket" "my-bucket" {
     }
   }
 }`,
-			mustExcludeResultCode: aws.AWSUnencryptedS3Bucket,
+			mustExcludeResultCode: checks.AWSUnencryptedS3Bucket,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_sns_topic_test.go b/internal/app/tfsec/aws_unencrypted_sns_topic_test.go
index 6503dfd3f..e2078a7ab 100644
--- a/internal/app/tfsec/aws_unencrypted_sns_topic_test.go
+++ b/internal/app/tfsec/aws_unencrypted_sns_topic_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSUnencryptedSNSTopic(t *testing.T) {
 resource "aws_sns_topic" "my-topic" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedSNSTopic,
+			mustIncludeResultCode: checks.AWSUnencryptedSNSTopic,
 		},
 		{
 			name: "check blank encryption key id specified for aws_sns_topic",
@@ -29,7 +29,7 @@ resource "aws_sns_topic" "my-topic" {
 resource "aws_sns_topic" "my-topic" {
 	kms_master_key_id = ""
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedSNSTopic,
+			mustIncludeResultCode: checks.AWSUnencryptedSNSTopic,
 		},
 		{
 			name: "check encryption key id specified for aws_sns_topic",
@@ -37,7 +37,7 @@ resource "aws_sns_topic" "my-topic" {
 resource "aws_sns_topic" "my-topic" {
 	kms_master_key_id = "/blah"
 }`,
-			mustExcludeResultCode: aws.AWSUnencryptedSNSTopic,
+			mustExcludeResultCode: checks.AWSUnencryptedSNSTopic,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unencrypted_sqs_queue_test.go b/internal/app/tfsec/aws_unencrypted_sqs_queue_test.go
index 9f4b19607..45d89e9d5 100644
--- a/internal/app/tfsec/aws_unencrypted_sqs_queue_test.go
+++ b/internal/app/tfsec/aws_unencrypted_sqs_queue_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSUnencryptedSQSQueue(t *testing.T) {
 resource "aws_sqs_queue" "my-queue" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedSQSQueue,
+			mustIncludeResultCode: checks.AWSUnencryptedSQSQueue,
 		},
 		{
 			name: "check blank encryption key id specified for aws_sqs_queue",
@@ -29,7 +29,7 @@ resource "aws_sqs_queue" "my-queue" {
 resource "aws_sqs_queue" "my-queue" {
 	kms_master_key_id = ""
 }`,
-			mustIncludeResultCode: aws.AWSUnencryptedSQSQueue,
+			mustIncludeResultCode: checks.AWSUnencryptedSQSQueue,
 		},
 		{
 			name: "check encryption key id specified for aws_sqs_queue",
@@ -37,7 +37,7 @@ resource "aws_sqs_queue" "my-queue" {
 resource "aws_sqs_queue" "my-queue" {
 	kms_master_key_id = "/blah"
 }`,
-			mustExcludeResultCode: aws.AWSUnencryptedSQSQueue,
+			mustExcludeResultCode: checks.AWSUnencryptedSQSQueue,
 		},
 	}
 
diff --git a/internal/app/tfsec/aws_unenforced_https_elasticsearch_domain_endpoint_test.go b/internal/app/tfsec/aws_unenforced_https_elasticsearch_domain_endpoint_test.go
index fa216e909..51664de6d 100644
--- a/internal/app/tfsec/aws_unenforced_https_elasticsearch_domain_endpoint_test.go
+++ b/internal/app/tfsec/aws_unenforced_https_elasticsearch_domain_endpoint_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/aws"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSUnenforcedHTTPSElasticsearchDomainEndpoint(t *testing.T) {
 resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
 	
 }`,
-			mustIncludeResultCode: aws.AWSUnenforcedHTTPSElasticsearchDomainEndpoint,
+			mustIncludeResultCode: checks.AWSUnenforcedHTTPSElasticsearchDomainEndpoint,
 		},
 		{
 			name: "check false enforce_https attr aws_elasticsearch_domain",
@@ -33,7 +33,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
     enforce_https = false
   }
 }`,
-			mustIncludeResultCode: aws.AWSUnenforcedHTTPSElasticsearchDomainEndpoint,
+			mustIncludeResultCode: checks.AWSUnenforcedHTTPSElasticsearchDomainEndpoint,
 		},
 		{
 			name: "check true enforce_https aws_elasticsearch_domain",
@@ -45,7 +45,7 @@ resource "aws_elasticsearch_domain" "my_elasticsearch_domain" {
     enforce_https = true
   }
 }`,
-			mustExcludeResultCode: aws.AWSUnenforcedHTTPSElasticsearchDomainEndpoint,
+			mustExcludeResultCode: checks.AWSUnenforcedHTTPSElasticsearchDomainEndpoint,
 		},
 	}
 
diff --git a/internal/app/tfsec/azurerm_open_network_security_rules_test.go b/internal/app/tfsec/azurerm_open_network_security_rules_test.go
index 4afc2cef0..a77735250 100644
--- a/internal/app/tfsec/azurerm_open_network_security_rules_test.go
+++ b/internal/app/tfsec/azurerm_open_network_security_rules_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/azure"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -23,7 +23,7 @@ resource "azurerm_network_security_rule" "my-rule" {
 	source_address_prefix = "0.0.0.0/0"
 	access = "Allow"
 }`,
-			mustIncludeResultCode: azure.AzureOpenInboundNetworkSecurityGroupRule,
+			mustIncludeResultCode: checks.AzureOpenInboundNetworkSecurityGroupRule,
 		},
 		{
 			name: "check azurerm_network_security_rule inbound on *",
@@ -33,7 +33,7 @@ resource "azurerm_network_security_rule" "my-rule" {
 	source_address_prefix = "*"
 	access = "Allow"
 }`,
-			mustIncludeResultCode: azure.AzureOpenInboundNetworkSecurityGroupRule,
+			mustIncludeResultCode: checks.AzureOpenInboundNetworkSecurityGroupRule,
 		},
 		{
 			name: "check azurerm_network_security_rule inbound on 0.0.0.0/0 in list",
@@ -43,7 +43,7 @@ resource "azurerm_network_security_rule" "my-rule" {
 	source_address_prefixes = ["0.0.0.0/0"]
 	access = "Allow"
 }`,
-			mustIncludeResultCode: azure.AzureOpenInboundNetworkSecurityGroupRule,
+			mustIncludeResultCode: checks.AzureOpenInboundNetworkSecurityGroupRule,
 		},
 		{
 			name: "check azurerm_network_security_rule inbound on * in list",
@@ -53,7 +53,7 @@ resource "azurerm_network_security_rule" "my-rule" {
 	source_address_prefixes = ["*"]
 	access = "Allow"
 }`,
-			mustIncludeResultCode: azure.AzureOpenInboundNetworkSecurityGroupRule,
+			mustIncludeResultCode: checks.AzureOpenInboundNetworkSecurityGroupRule,
 		},
 		{
 			name: "check azurerm_network_security_rule outbound on 0.0.0.0/0",
@@ -63,7 +63,7 @@ resource "azurerm_network_security_rule" "my-rule" {
 	destination_address_prefix = "0.0.0.0/0"
 	access = "Allow"
 }`,
-			mustIncludeResultCode: azure.AzureOpenOutboundNetworkSecurityGroupRule,
+			mustIncludeResultCode: checks.AzureOpenOutboundNetworkSecurityGroupRule,
 		},
 		{
 			name: "check azurerm_network_security_rule outbound on 0.0.0.0/0 in list",
@@ -73,7 +73,7 @@ resource "azurerm_network_security_rule" "my-rule" {
 	destination_address_prefixes = ["0.0.0.0/0"]
 	access = "Allow"
 }`,
-			mustIncludeResultCode: azure.AzureOpenOutboundNetworkSecurityGroupRule,
+			mustIncludeResultCode: checks.AzureOpenOutboundNetworkSecurityGroupRule,
 		},
 		{
 			name: "check azurerm_network_security_rule outbound on 10.0.0.0/16",
@@ -83,7 +83,7 @@ resource "azurerm_network_security_rule" "my-rule" {
 	destination_address_prefix = "10.0.0.0/16"
 	access = "Allow"
 }`,
-			mustExcludeResultCode: azure.AzureOpenOutboundNetworkSecurityGroupRule,
+			mustExcludeResultCode: checks.AzureOpenOutboundNetworkSecurityGroupRule,
 		},
 		{
 			name: "check azurerm_network_security_rule inbound on 0.0.0.0/0",
@@ -93,7 +93,7 @@ resource "azurerm_network_security_rule" "my-rule" {
 	source_address_prefix = "0.0.0.0/0"
 	access = "Deny"
 }`,
-			mustExcludeResultCode: azure.AzureOpenInboundNetworkSecurityGroupRule,
+			mustExcludeResultCode: checks.AzureOpenInboundNetworkSecurityGroupRule,
 		},
 	}
 
diff --git a/internal/app/tfsec/azurerm_unencrypted_data_lake_store_test.go b/internal/app/tfsec/azurerm_unencrypted_data_lake_store_test.go
index 75de24d14..40255bc4a 100644
--- a/internal/app/tfsec/azurerm_unencrypted_data_lake_store_test.go
+++ b/internal/app/tfsec/azurerm_unencrypted_data_lake_store_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/azure"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AzureUnencryptedDataLakeStore(t *testing.T) {
 resource "azurerm_data_lake_store" "my-lake-store" {
 	encryption_state = "Disabled"
 }`,
-			mustIncludeResultCode: azure.AzureUnencryptedDataLakeStore,
+			mustIncludeResultCode: checks.AzureUnencryptedDataLakeStore,
 		},
 		{
 			name: "check azurerm_data_lake_store with encryption enabled",
@@ -29,7 +29,7 @@ resource "azurerm_data_lake_store" "my-lake-store" {
 resource "azurerm_data_lake_store" "my-lake-store" {
 	encryption_state = "Enabled"
 }`,
-			mustExcludeResultCode: azure.AzureUnencryptedDataLakeStore,
+			mustExcludeResultCode: checks.AzureUnencryptedDataLakeStore,
 		},
 		{
 			name: "check azurerm_data_lake_store with encryption enabled by default",
@@ -37,7 +37,7 @@ resource "azurerm_data_lake_store" "my-lake-store" {
 resource "azurerm_data_lake_store" "my-lake-store" {
 	
 }`,
-			mustExcludeResultCode: azure.AzureUnencryptedDataLakeStore,
+			mustExcludeResultCode: checks.AzureUnencryptedDataLakeStore,
 		},
 	}
 
diff --git a/internal/app/tfsec/azurerm_unencrypted_managed_disk_test.go b/internal/app/tfsec/azurerm_unencrypted_managed_disk_test.go
index bac2494b2..a0e464abe 100644
--- a/internal/app/tfsec/azurerm_unencrypted_managed_disk_test.go
+++ b/internal/app/tfsec/azurerm_unencrypted_managed_disk_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/azure"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AzureUnencryptedManagedDisk(t *testing.T) {
 resource "azurerm_managed_disk" "my-disk" {
 	
 }`,
-			mustIncludeResultCode: azure.AzureUnencryptedManagedDisk,
+			mustIncludeResultCode: checks.AzureUnencryptedManagedDisk,
 		},
 		{
 			name: "check azurerm_managed_disk with encryption disabled",
@@ -31,7 +31,7 @@ resource "azurerm_managed_disk" "my-disk" {
 		enabled = false
 	}
 }`,
-			mustIncludeResultCode: azure.AzureUnencryptedManagedDisk,
+			mustIncludeResultCode: checks.AzureUnencryptedManagedDisk,
 		},
 		{
 			name: "check azurerm_managed_disk with encryption enabled",
@@ -41,7 +41,7 @@ resource "azurerm_managed_disk" "my-disk" {
 		enabled = true
 	}
 }`,
-			mustExcludeResultCode: azure.AzureUnencryptedManagedDisk,
+			mustExcludeResultCode: checks.AzureUnencryptedManagedDisk,
 		},
 	}
 
diff --git a/internal/app/tfsec/azurerm_virtual_machine_with_password_authentication_test.go b/internal/app/tfsec/azurerm_virtual_machine_with_password_authentication_test.go
index aaba89618..35da7f147 100644
--- a/internal/app/tfsec/azurerm_virtual_machine_with_password_authentication_test.go
+++ b/internal/app/tfsec/azurerm_virtual_machine_with_password_authentication_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/azure"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -23,7 +23,7 @@ resource "azurerm_virtual_machine" "my-disk" {
 		disable_password_authentication = false
 	}
 }`,
-			mustIncludeResultCode: azure.AzureVMWithPasswordAuthentication,
+			mustIncludeResultCode: checks.AzureVMWithPasswordAuthentication,
 		},
 		{
 			name: "check azurerm_virtual_machine without password auth",
@@ -33,7 +33,7 @@ resource "azurerm_virtual_machine" "my-disk" {
 		disable_password_authentication = true
 	}
 }`,
-			mustExcludeResultCode: azure.AzureVMWithPasswordAuthentication,
+			mustExcludeResultCode: checks.AzureVMWithPasswordAuthentication,
 		},
 	}
 
diff --git a/internal/app/tfsec/checks/utils_test.go b/internal/app/tfsec/checks/utils_test.go
index eed1d5fbd..4728c3e0f 100644
--- a/internal/app/tfsec/checks/utils_test.go
+++ b/internal/app/tfsec/checks/utils_test.go
@@ -48,7 +48,7 @@ func Test_isBooleanOrStringTrue(t *testing.T) {
 			},
 			nil,
 		)
-		if result := IsBooleanOrStringTrue(attr); result != test.result {
+		if result := isBooleanOrStringTrue(attr); result != test.result {
 			t.Errorf("expected %v got %v\n", test.val, result)
 		}
 	}
diff --git a/internal/app/tfsec/generic_sensitive_attributes_test.go b/internal/app/tfsec/generic_sensitive_attributes_test.go
index 89a2dd58a..fa0101027 100644
--- a/internal/app/tfsec/generic_sensitive_attributes_test.go
+++ b/internal/app/tfsec/generic_sensitive_attributes_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/general"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSSensitiveAttributes(t *testing.T) {
 resource "evil_corp" "virtual_machine" {
 	root_password = "secret"
 }`,
-			mustIncludeResultCode: general.GenericSensitiveAttributes,
+			mustIncludeResultCode: checks.GenericSensitiveAttributes,
 		},
 		{
 			name: "check non-sensitive local",
@@ -29,7 +29,7 @@ resource "evil_corp" "virtual_machine" {
 resource "evil_corp" "virtual_machine" {
 	memory = 512
 }`,
-			mustExcludeResultCode: general.GenericSensitiveAttributes,
+			mustExcludeResultCode: checks.GenericSensitiveAttributes,
 		},
 		{
 			name: "avoid false positive for aws_efs_file_system",
@@ -37,7 +37,7 @@ resource "evil_corp" "virtual_machine" {
 resource "aws_efs_file_system" "myfs" {
 	creation_token = "something"
 }`,
-			mustExcludeResultCode: general.GenericSensitiveAttributes,
+			mustExcludeResultCode: checks.GenericSensitiveAttributes,
 		},
 	}
 
diff --git a/internal/app/tfsec/generic_sensitive_locals_test.go b/internal/app/tfsec/generic_sensitive_locals_test.go
index 1fe6e01d2..1a27b2559 100644
--- a/internal/app/tfsec/generic_sensitive_locals_test.go
+++ b/internal/app/tfsec/generic_sensitive_locals_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/general"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSSensitiveLocals(t *testing.T) {
 locals {
 	password = "secret"
 }`,
-			mustIncludeResultCode: general.GenericSensitiveLocals,
+			mustIncludeResultCode: checks.GenericSensitiveLocals,
 		},
 		{
 			name: "check non-sensitive local",
@@ -29,7 +29,7 @@ locals {
 locals {
 	something = "something"
 }`,
-			mustExcludeResultCode: general.GenericSensitiveLocals,
+			mustExcludeResultCode: checks.GenericSensitiveLocals,
 		},
 	}
 
diff --git a/internal/app/tfsec/generic_sensitive_variables_test.go b/internal/app/tfsec/generic_sensitive_variables_test.go
index a13e12ed2..86d06f1c0 100644
--- a/internal/app/tfsec/generic_sensitive_variables_test.go
+++ b/internal/app/tfsec/generic_sensitive_variables_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/general"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_AWSSensitiveVariables(t *testing.T) {
 variable "db_password" {
 	default = "something"
 }`,
-			mustIncludeResultCode: general.GenericSensitiveVariables,
+			mustIncludeResultCode: checks.GenericSensitiveVariables,
 		},
 		{
 			name: "check sensitive variable without value",
@@ -29,7 +29,7 @@ variable "db_password" {
 variable "db_password" {
 	default = ""
 }`,
-			mustExcludeResultCode: general.GenericSensitiveVariables,
+			mustExcludeResultCode: checks.GenericSensitiveVariables,
 		},
 	}
 
diff --git a/internal/app/tfsec/gke_abac_enabled_test.go b/internal/app/tfsec/gke_abac_enabled_test.go
index d8a8b373d..24fda269f 100644
--- a/internal/app/tfsec/gke_abac_enabled_test.go
+++ b/internal/app/tfsec/gke_abac_enabled_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -22,7 +22,7 @@ resource "google_container_cluster" "gke" {
 	enable_legacy_abac = "true"
 	
 }`,
-			mustIncludeResultCode: google.GkeAbacEnabled,
+			mustIncludeResultCode: checks.GkeAbacEnabled,
 		},
 	}
 
diff --git a/internal/app/tfsec/gke_enforce_psp_test.go b/internal/app/tfsec/gke_enforce_psp_test.go
index ea247da30..2a4c921b2 100644
--- a/internal/app/tfsec/gke_enforce_psp_test.go
+++ b/internal/app/tfsec/gke_enforce_psp_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -23,7 +23,7 @@ resource "google_container_cluster" "gke" {
     enabled = "false"
   }
 }`,
-			mustIncludeResultCode: google.GkeEnforcePSP,
+			mustIncludeResultCode: checks.GkeEnforcePSP,
 		},
 		{
 			name: "check google_container_cluster with pod_security_policy_config block not set",
@@ -31,7 +31,7 @@ resource "google_container_cluster" "gke" {
 resource "google_container_cluster" "gke" {
 
 }`,
-			mustIncludeResultCode: google.GkeEnforcePSP,
+			mustIncludeResultCode: checks.GkeEnforcePSP,
 		},
 		{
 			name: "check google_container_cluster with pod_security_policy_config.enabled set to true",
@@ -41,7 +41,7 @@ resource "google_container_cluster" "gke" {
     enabled = "true"
   }
 }`,
-			mustExcludeResultCode: google.GkeEnforcePSP,
+			mustExcludeResultCode: checks.GkeEnforcePSP,
 		},
 	}
 
diff --git a/internal/app/tfsec/gke_legacy_auth_enabled_test.go b/internal/app/tfsec/gke_legacy_auth_enabled_test.go
index e8f9488f5..f5a31b097 100644
--- a/internal/app/tfsec/gke_legacy_auth_enabled_test.go
+++ b/internal/app/tfsec/gke_legacy_auth_enabled_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_GkeLegacyAuthEnabled(t *testing.T) {
 resource "google_container_cluster" "gke" {
 
 }`,
-			mustIncludeResultCode: google.GkeLegacyAuthEnabled,
+			mustIncludeResultCode: checks.GkeLegacyAuthEnabled,
 		},
 		{
 			name: "check google_container_cluster with master_auth static user/pass disabled",
@@ -32,7 +32,7 @@ resource "google_container_cluster" "gke" {
     password = ""
 	}
 }`,
-			mustExcludeResultCode: google.GkeLegacyAuthEnabled,
+			mustExcludeResultCode: checks.GkeLegacyAuthEnabled,
 		},
 		{
 			name: "check google_container_cluster with client cert enabled and master_auth static user/pass disabled",
@@ -46,7 +46,7 @@ resource "google_container_cluster" "gke" {
     }
 	}
 }`,
-			mustIncludeResultCode: google.GkeLegacyAuthEnabled,
+			mustIncludeResultCode: checks.GkeLegacyAuthEnabled,
 		},
 	}
 
diff --git a/internal/app/tfsec/gke_legacy_metadata_endpoints_test.go b/internal/app/tfsec/gke_legacy_metadata_endpoints_test.go
index 3d8bbede5..116279a0b 100644
--- a/internal/app/tfsec/gke_legacy_metadata_endpoints_test.go
+++ b/internal/app/tfsec/gke_legacy_metadata_endpoints_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -23,7 +23,7 @@ resource "google_container_cluster" "gke" {
     disable-legacy-endpoints = false
   }
 }`,
-			mustIncludeResultCode: google.GkeLegacyMetadataEndpoints,
+			mustIncludeResultCode: checks.GkeLegacyMetadataEndpoints,
 		},
 		{
 			name: "check google_container_cluster with metadata.disable-legacy-endpoints set to true",
@@ -33,7 +33,7 @@ resource "google_container_cluster" "gke" {
     disable-legacy-endpoints = true
   }
 }`,
-			mustExcludeResultCode: google.GkeLegacyMetadataEndpoints,
+			mustExcludeResultCode: checks.GkeLegacyMetadataEndpoints,
 		},
 	}
 
diff --git a/internal/app/tfsec/gke_node_metadata_exposed_test.go b/internal/app/tfsec/gke_node_metadata_exposed_test.go
index 2397d4906..6815db703 100644
--- a/internal/app/tfsec/gke_node_metadata_exposed_test.go
+++ b/internal/app/tfsec/gke_node_metadata_exposed_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -23,7 +23,7 @@ resource "google_container_cluster" "gke" {
 		node_metadata = "EXPOSE"
 		}
 }`,
-			mustIncludeResultCode: google.GkeNodeMetadataExposed,
+			mustIncludeResultCode: checks.GkeNodeMetadataExposed,
 		},
 		{
 			name: "check google_container_cluster with workload_metadata_config.node_metadata set to UNSPECIFIED",
@@ -33,7 +33,7 @@ resource "google_container_cluster" "gke" {
 		node_metadata = "UNSPECIFIED"
 		}
 }`,
-			mustIncludeResultCode: google.GkeNodeMetadataExposed,
+			mustIncludeResultCode: checks.GkeNodeMetadataExposed,
 		},
 	}
 
diff --git a/internal/app/tfsec/gke_shielded_nodes_disabled_test.go b/internal/app/tfsec/gke_shielded_nodes_disabled_test.go
index 999ade13a..88fab2cb6 100644
--- a/internal/app/tfsec/gke_shielded_nodes_disabled_test.go
+++ b/internal/app/tfsec/gke_shielded_nodes_disabled_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -22,14 +22,14 @@ resource "google_container_cluster" "gke" {
 	enable_shielded_nodes = "false"
 
 }`,
-			mustIncludeResultCode: google.GkeShieldedNodesDisabled,
+			mustIncludeResultCode: checks.GkeShieldedNodesDisabled,
 		},
 		{
 			name: "check google_container_cluster with enable_shielded_nodes not set",
 			source: `
 resource "google_container_cluster" "gke" {
 }`,
-			mustIncludeResultCode: google.GkeShieldedNodesDisabled,
+			mustIncludeResultCode: checks.GkeShieldedNodesDisabled,
 		},
 		{
 			name: "check google_container_cluster with enable_shielded_nodes set to true",
@@ -38,7 +38,7 @@ resource "google_container_cluster" "gke" {
 	enable_shielded_nodes = "true"
 
 }`,
-			mustExcludeResultCode: google.GkeShieldedNodesDisabled,
+			mustExcludeResultCode: checks.GkeShieldedNodesDisabled,
 		},
 	}
 
diff --git a/internal/app/tfsec/google_open_firewall_rule_test.go b/internal/app/tfsec/google_open_firewall_rule_test.go
index b1f19fedc..00f4925c2 100644
--- a/internal/app/tfsec/google_open_firewall_rule_test.go
+++ b/internal/app/tfsec/google_open_firewall_rule_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_GoogleOpenInboundFirewallRule(t *testing.T) {
 resource "google_compute_firewall" "my-firewall" {
 	source_ranges = ["0.0.0.0/0"]
 }`,
-			mustIncludeResultCode: google.GoogleOpenInboundFirewallRule,
+			mustIncludeResultCode: checks.GoogleOpenInboundFirewallRule,
 		},
 		{
 			name: "check google_compute_firewall ingress on /32",
@@ -29,7 +29,7 @@ resource "google_compute_firewall" "my-firewall" {
 resource "google_compute_firewall" "my-firewall" {
 	source_ranges = ["1.2.3.4/32"]
 }`,
-			mustExcludeResultCode: google.GoogleOpenInboundFirewallRule,
+			mustExcludeResultCode: checks.GoogleOpenInboundFirewallRule,
 		},
 	}
 
@@ -56,7 +56,7 @@ func Test_GoogleOpenOutboundFirewallRule(t *testing.T) {
 resource "google_compute_firewall" "my-firewall" {
 	destination_ranges = ["0.0.0.0/0"]
 }`,
-			mustIncludeResultCode: google.GoogleOpenOutboundFirewallRule,
+			mustIncludeResultCode: checks.GoogleOpenOutboundFirewallRule,
 		},
 		{
 			name: "check google_compute_firewall egress on /32",
@@ -64,7 +64,7 @@ resource "google_compute_firewall" "my-firewall" {
 resource "google_compute_firewall" "my-firewall" {
 	destination_ranges = ["1.2.3.4/32"]
 }`,
-			mustExcludeResultCode: google.GoogleOpenOutboundFirewallRule,
+			mustExcludeResultCode: checks.GoogleOpenOutboundFirewallRule,
 		},
 	}
 
diff --git a/internal/app/tfsec/google_unencrypted_disk_test.go b/internal/app/tfsec/google_unencrypted_disk_test.go
index a4fcc509b..9e4f7c316 100644
--- a/internal/app/tfsec/google_unencrypted_disk_test.go
+++ b/internal/app/tfsec/google_unencrypted_disk_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_GoogleUnencryptedDisk(t *testing.T) {
 resource "google_compute_disk" "my-disk" {
 	
 }`,
-			mustIncludeResultCode: google.GoogleUnencryptedDisk,
+			mustIncludeResultCode: checks.GoogleUnencryptedDisk,
 		},
 		{
 			name: "check google_compute_disk with empty disk_encryption_key block",
@@ -29,7 +29,7 @@ resource "google_compute_disk" "my-disk" {
 resource "google_compute_disk" "my-disk" {
 	disk_encryption_key {}
 }`,
-			mustIncludeResultCode: google.GoogleUnencryptedDisk,
+			mustIncludeResultCode: checks.GoogleUnencryptedDisk,
 		},
 		{
 			name: "check google_compute_disk with raw key encryption",
@@ -39,7 +39,7 @@ resource "google_compute_disk" "my-disk" {
 		raw_key = "something"
 	}
 }`,
-			mustExcludeResultCode: google.GoogleUnencryptedDisk,
+			mustExcludeResultCode: checks.GoogleUnencryptedDisk,
 		},
 		{
 			name: "check google_compute_disk with kms link",
@@ -49,7 +49,7 @@ resource "google_compute_disk" "my-disk" {
 		kms_key_self_link = "something"
 	}
 }`,
-			mustExcludeResultCode: google.GoogleUnencryptedDisk,
+			mustExcludeResultCode: checks.GoogleUnencryptedDisk,
 		},
 	}
 
diff --git a/internal/app/tfsec/google_unencrypted_storage_bucket_test.go b/internal/app/tfsec/google_unencrypted_storage_bucket_test.go
index 6f8b28db7..b3efdd37b 100644
--- a/internal/app/tfsec/google_unencrypted_storage_bucket_test.go
+++ b/internal/app/tfsec/google_unencrypted_storage_bucket_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -21,7 +21,7 @@ func Test_GoogleUnencryptedStorageBucket(t *testing.T) {
 resource "google_storage_bucket" "my-bucket" {
 	
 }`,
-			mustIncludeResultCode: google.GoogleUnencryptedStorageBucket,
+			mustIncludeResultCode: checks.GoogleUnencryptedStorageBucket,
 		},
 		{
 			name: "check google_storage_bucket with no encryption kms key name",
@@ -29,7 +29,7 @@ resource "google_storage_bucket" "my-bucket" {
 resource "google_storage_bucket" "my-bucket" {
 	encryption {}	
 }`,
-			mustExcludeResultCode: google.GoogleUnencryptedStorageBucket,
+			mustExcludeResultCode: checks.GoogleUnencryptedStorageBucket,
 		},
 		{
 			name: "check google_storage_bucket with non-empty encryption kms key name",
@@ -39,7 +39,7 @@ resource "google_storage_bucket" "my-bucket" {
 		default_kms_key_name = "my-key"
 	}	
 }`,
-			mustExcludeResultCode: google.GoogleUnencryptedStorageBucket,
+			mustExcludeResultCode: checks.GoogleUnencryptedStorageBucket,
 		},
 	}
 
diff --git a/internal/app/tfsec/google_user_iam_grant_test.go b/internal/app/tfsec/google_user_iam_grant_test.go
index 8664b3650..76890099e 100644
--- a/internal/app/tfsec/google_user_iam_grant_test.go
+++ b/internal/app/tfsec/google_user_iam_grant_test.go
@@ -3,7 +3,7 @@ package tfsec
 import (
 	"testing"
 
-	"github.com/tfsec/tfsec/internal/app/tfsec/checks/google"
+	"github.com/tfsec/tfsec/internal/app/tfsec/checks"
 	"github.com/tfsec/tfsec/internal/app/tfsec/scanner"
 )
 
@@ -23,7 +23,7 @@ resource "google_project_iam_binding" "project-binding" {
 		"user:test@example.com",
 		]
 }`,
-			mustIncludeResultCode: google.GoogleUserIAMGrant,
+			mustIncludeResultCode: checks.GoogleUserIAMGrant,
 		},
 		{
 			name: "check google_project_iam_binding with grant to user identity",
@@ -33,7 +33,7 @@ resource "google_project_iam_binding" "project-binding" {
 		"group:test@example.com",
 		]
 }`,
-			mustExcludeResultCode: google.GoogleUserIAMGrant,
+			mustExcludeResultCode: checks.GoogleUserIAMGrant,
 		},
 		{
 			name: "check google_project_iam_member with grant to user identity",
@@ -41,7 +41,7 @@ resource "google_project_iam_binding" "project-binding" {
 resource "google_project_iam_member" "project-member" {
 	member = "user:test@example.com"
 }`,
-			mustIncludeResultCode: google.GoogleUserIAMGrant,
+			mustIncludeResultCode: checks.GoogleUserIAMGrant,
 		},
 		{
 			name: "check google_storage_bucket_iam_binding with grant to user identity",
@@ -51,7 +51,7 @@ resource "google_storage_bucket_iam_binding" "bucket-binding" {
 		"user:test@example.com",
 		]
 }`,
-			mustIncludeResultCode: google.GoogleUserIAMGrant,
+			mustIncludeResultCode: checks.GoogleUserIAMGrant,
 		},
 		{
 			name: "check google_storage_bucket_iam_member with grant to user identity",
@@ -59,7 +59,7 @@ resource "google_storage_bucket_iam_binding" "bucket-binding" {
 resource "google_storage_bucket_iam_member" "bucket-member" {
 	member = "user:test@example.com"
 }`,
-			mustIncludeResultCode: google.GoogleUserIAMGrant,
+			mustIncludeResultCode: checks.GoogleUserIAMGrant,
 		},
 		{
 			name: "check google_storage_bucket_iam_member with grant to service account identity",
@@ -67,7 +67,7 @@ resource "google_storage_bucket_iam_member" "bucket-member" {
 resource "google_storage_bucket_iam_member" "bucket-member" {
 	member = "serviceAccount:test@example.com"
 }`,
-			mustExcludeResultCode: google.GoogleUserIAMGrant,
+			mustExcludeResultCode: checks.GoogleUserIAMGrant,
 		},
 		{
 			name: "check data.google_iam_policy with grant to user",
@@ -80,7 +80,7 @@ data "google_iam_policy" "test-policy" {
 		]
 	}
 }`,
-			mustIncludeResultCode: google.GoogleUserIAMGrant,
+			mustIncludeResultCode: checks.GoogleUserIAMGrant,
 		},
 	}