diff --git a/plugins/source/heroku/docs/docs.go b/plugins/source/heroku/docs/docs.go
index 9efe183d93cb8a..82a2e0e1a2780e 100644
--- a/plugins/source/heroku/docs/docs.go
+++ b/plugins/source/heroku/docs/docs.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/cloudquery/cloudquery/plugins/source/heroku/provider"
+	"github.com/cloudquery/cloudquery/plugins/source/heroku/resources/provider"
 	"github.com/cloudquery/cq-provider-sdk/provider/docs"
 )
 
diff --git a/plugins/source/heroku/main.go b/plugins/source/heroku/main.go
index fa3de27f8a46c7..5fc0c282170970 100644
--- a/plugins/source/heroku/main.go
+++ b/plugins/source/heroku/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/cloudquery/cloudquery/plugins/source/heroku/provider"
+	"github.com/cloudquery/cloudquery/plugins/source/heroku/resources/provider"
 	"github.com/cloudquery/cq-provider-sdk/serve"
 )
 
diff --git a/plugins/source/heroku/provider/provider.go b/plugins/source/heroku/resources/provider/provider.go
similarity index 100%
rename from plugins/source/heroku/provider/provider.go
rename to plugins/source/heroku/resources/provider/provider.go
diff --git a/plugins/source/okta/docs/docs.go b/plugins/source/okta/docs/docs.go
index 25f687056bd486..7f7648893cb0b3 100644
--- a/plugins/source/okta/docs/docs.go
+++ b/plugins/source/okta/docs/docs.go
@@ -3,12 +3,12 @@ package main
 import (
 	"log"
 
-	"github.com/cloudquery/cloudquery/plugins/source/okta/resources"
+	"github.com/cloudquery/cloudquery/plugins/source/okta/resources/provider"
 	"github.com/cloudquery/cq-provider-sdk/provider/docs"
 )
 
 func main() {
-	err := docs.GenerateDocs(resources.Provider(), "./docs", true)
+	err := docs.GenerateDocs(provider.Provider(), "./docs", true)
 	if err != nil {
 		log.Fatalf("Failed to geneerate docs: %s", err)
 	}
diff --git a/plugins/source/okta/main.go b/plugins/source/okta/main.go
index b1c8515b8d1ce3..51b35c3807706b 100644
--- a/plugins/source/okta/main.go
+++ b/plugins/source/okta/main.go
@@ -1,14 +1,14 @@
 package main
 
 import (
-	"github.com/cloudquery/cloudquery/plugins/source/okta/resources"
+	"github.com/cloudquery/cloudquery/plugins/source/okta/resources/provider"
 	"github.com/cloudquery/cq-provider-sdk/serve"
 )
 
 func main() {
 	serve.Serve(&serve.Options{
 		Name:                "okta",
-		Provider:            resources.Provider(),
+		Provider:            provider.Provider(),
 		Logger:              nil,
 		NoLogOutputOverride: false,
 	})
diff --git a/plugins/source/okta/resources/provider.go b/plugins/source/okta/resources/provider/provider.go
similarity index 81%
rename from plugins/source/okta/resources/provider.go
rename to plugins/source/okta/resources/provider/provider.go
index 303efcec25a8e5..ec3649a4476905 100644
--- a/plugins/source/okta/resources/provider.go
+++ b/plugins/source/okta/resources/provider/provider.go
@@ -1,7 +1,8 @@
-package resources
+package provider
 
 import (
 	"github.com/cloudquery/cloudquery/plugins/source/okta/client"
+	"github.com/cloudquery/cloudquery/plugins/source/okta/resources"
 	"github.com/cloudquery/cq-provider-sdk/provider"
 	"github.com/cloudquery/cq-provider-sdk/provider/schema"
 )
@@ -16,7 +17,7 @@ func Provider() *provider.Provider {
 		Version:   Version,
 		Configure: client.Configure,
 		ResourceMap: map[string]*schema.Table{
-			"users": Users(),
+			"users": resources.Users(),
 		},
 		Config: func() provider.Config {
 			return &client.Config{}
diff --git a/plugins/source/terraform/docs/docs.go b/plugins/source/terraform/docs/docs.go
index 3131f79eac2fd2..2b541376c64be7 100644
--- a/plugins/source/terraform/docs/docs.go
+++ b/plugins/source/terraform/docs/docs.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/cloudquery/cloudquery/plugins/source/terraform/resources"
+	"github.com/cloudquery/cloudquery/plugins/source/terraform/resources/provider"
 	"github.com/cloudquery/cq-provider-sdk/provider/docs"
 )
 
 func main() {
-	err := docs.GenerateDocs(resources.Provider(), "./docs", true)
+	err := docs.GenerateDocs(provider.Provider(), "./docs", true)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to generate docs: %s\n", err)
 	}
diff --git a/plugins/source/terraform/main.go b/plugins/source/terraform/main.go
index 3d44b903a4930e..df98aa62adeded 100644
--- a/plugins/source/terraform/main.go
+++ b/plugins/source/terraform/main.go
@@ -1,13 +1,13 @@
 package main
 
 import (
-	"github.com/cloudquery/cloudquery/plugins/source/terraform/resources"
+	"github.com/cloudquery/cloudquery/plugins/source/terraform/resources/provider"
 	"github.com/cloudquery/cq-provider-sdk/serve"
 )
 
 func main() {
 	serve.Serve(&serve.Options{
 		Name:     "terraform",
-		Provider: resources.Provider(),
+		Provider: provider.Provider(),
 	})
 }
diff --git a/plugins/source/terraform/resources/provider.go b/plugins/source/terraform/resources/provider/provider.go
similarity index 79%
rename from plugins/source/terraform/resources/provider.go
rename to plugins/source/terraform/resources/provider/provider.go
index e4f9ec9a6319b4..7338b8a9635bdb 100644
--- a/plugins/source/terraform/resources/provider.go
+++ b/plugins/source/terraform/resources/provider/provider.go
@@ -1,7 +1,8 @@
-package resources
+package provider
 
 import (
 	"github.com/cloudquery/cloudquery/plugins/source/terraform/client"
+	"github.com/cloudquery/cloudquery/plugins/source/terraform/resources"
 	"github.com/cloudquery/cq-provider-sdk/provider"
 	"github.com/cloudquery/cq-provider-sdk/provider/schema"
 )
@@ -16,7 +17,7 @@ func Provider() *provider.Provider {
 		Version:   Version,
 		Configure: client.Configure,
 		ResourceMap: map[string]*schema.Table{
-			"tf.data": TFData(),
+			"tf.data": resources.TFData(),
 		},
 		Config: func() provider.Config {
 			return &client.Config{}
diff --git a/plugins/source/terraform/resources/tfdata_test.go b/plugins/source/terraform/resources/tfdata_test.go
index b13dce8449a8f7..cbbe190b86fb3e 100644
--- a/plugins/source/terraform/resources/tfdata_test.go
+++ b/plugins/source/terraform/resources/tfdata_test.go
@@ -1,8 +1,9 @@
-package resources
+package resources_test
 
 import (
 	"testing"
 
+	"github.com/cloudquery/cloudquery/plugins/source/terraform/resources/provider"
 	providertest "github.com/cloudquery/cq-provider-sdk/provider/testing"
 )
 
@@ -15,7 +16,7 @@ func TestTfData(t *testing.T) {
 `
 
 	providertest.TestResource(t, providertest.ResourceTestCase{
-		Provider: Provider(),
+		Provider: provider.Provider(),
 		Config:   cfg,
 	})
 }