diff --git a/pkg/k8s/engine.go b/pkg/engines/k8s/engine.go
similarity index 100%
rename from pkg/k8s/engine.go
rename to pkg/engines/k8s/engine.go
diff --git a/pkg/k8s/kubernetes.go b/pkg/engines/k8s/kubernetes.go
similarity index 100%
rename from pkg/k8s/kubernetes.go
rename to pkg/engines/k8s/kubernetes.go
diff --git a/pkg/k8s/labeler.go b/pkg/engines/k8s/labeler.go
similarity index 100%
rename from pkg/k8s/labeler.go
rename to pkg/engines/k8s/labeler.go
diff --git a/pkg/k8s/labeler_test.go b/pkg/engines/k8s/labeler_test.go
similarity index 100%
rename from pkg/k8s/labeler_test.go
rename to pkg/engines/k8s/labeler_test.go
diff --git a/pkg/slurm/slurm.go b/pkg/engines/slurm/slurm.go
similarity index 100%
rename from pkg/slurm/slurm.go
rename to pkg/engines/slurm/slurm.go
diff --git a/pkg/factory/engine.go b/pkg/factory/engine.go
index aa4f960..f56f7d4 100644
--- a/pkg/factory/engine.go
+++ b/pkg/factory/engine.go
@@ -22,8 +22,8 @@ import (
 	"net/http"
 
 	"github.com/NVIDIA/topograph/pkg/common"
-	"github.com/NVIDIA/topograph/pkg/k8s"
-	"github.com/NVIDIA/topograph/pkg/slurm"
+	"github.com/NVIDIA/topograph/pkg/engines/k8s"
+	"github.com/NVIDIA/topograph/pkg/engines/slurm"
 )
 
 func GetEngine(engine string) (common.Engine, *common.HTTPError) {
diff --git a/pkg/factory/provider.go b/pkg/factory/provider.go
index ed36df6..f38b7ea 100644
--- a/pkg/factory/provider.go
+++ b/pkg/factory/provider.go
@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/NVIDIA/topograph/pkg/aws"
 	"github.com/NVIDIA/topograph/pkg/common"
-	"github.com/NVIDIA/topograph/pkg/cw"
-	"github.com/NVIDIA/topograph/pkg/gcp"
-	"github.com/NVIDIA/topograph/pkg/oci"
+	"github.com/NVIDIA/topograph/pkg/providers/aws"
+	"github.com/NVIDIA/topograph/pkg/providers/cw"
+	"github.com/NVIDIA/topograph/pkg/providers/gcp"
+	"github.com/NVIDIA/topograph/pkg/providers/oci"
 	"github.com/NVIDIA/topograph/pkg/translate"
 )
 
diff --git a/pkg/aws/imds.go b/pkg/providers/aws/imds.go
similarity index 100%
rename from pkg/aws/imds.go
rename to pkg/providers/aws/imds.go
diff --git a/pkg/aws/instance_topology.go b/pkg/providers/aws/instance_topology.go
similarity index 100%
rename from pkg/aws/instance_topology.go
rename to pkg/providers/aws/instance_topology.go
diff --git a/pkg/aws/instance_topology_test.go b/pkg/providers/aws/instance_topology_test.go
similarity index 100%
rename from pkg/aws/instance_topology_test.go
rename to pkg/providers/aws/instance_topology_test.go
diff --git a/pkg/aws/metrics.go b/pkg/providers/aws/metrics.go
similarity index 100%
rename from pkg/aws/metrics.go
rename to pkg/providers/aws/metrics.go
diff --git a/pkg/aws/provider.go b/pkg/providers/aws/provider.go
similarity index 97%
rename from pkg/aws/provider.go
rename to pkg/providers/aws/provider.go
index 28bf8c0..e96a34a 100644
--- a/pkg/aws/provider.go
+++ b/pkg/providers/aws/provider.go
@@ -26,8 +26,8 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/NVIDIA/topograph/pkg/common"
-	"github.com/NVIDIA/topograph/pkg/k8s"
-	"github.com/NVIDIA/topograph/pkg/slurm"
+	"github.com/NVIDIA/topograph/pkg/engines/k8s"
+	"github.com/NVIDIA/topograph/pkg/engines/slurm"
 )
 
 type Provider struct{}
diff --git a/pkg/cw/provider.go b/pkg/providers/cw/provider.go
similarity index 95%
rename from pkg/cw/provider.go
rename to pkg/providers/cw/provider.go
index dc30e31..3963657 100644
--- a/pkg/cw/provider.go
+++ b/pkg/providers/cw/provider.go
@@ -25,9 +25,9 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/NVIDIA/topograph/pkg/common"
+	"github.com/NVIDIA/topograph/pkg/engines/k8s"
+	"github.com/NVIDIA/topograph/pkg/engines/slurm"
 	"github.com/NVIDIA/topograph/pkg/ib"
-	"github.com/NVIDIA/topograph/pkg/k8s"
-	"github.com/NVIDIA/topograph/pkg/slurm"
 )
 
 type Provider struct{}
diff --git a/pkg/gcp/instance_topology.go b/pkg/providers/gcp/instance_topology.go
similarity index 100%
rename from pkg/gcp/instance_topology.go
rename to pkg/providers/gcp/instance_topology.go
diff --git a/pkg/gcp/instance_topology_test.go b/pkg/providers/gcp/instance_topology_test.go
similarity index 100%
rename from pkg/gcp/instance_topology_test.go
rename to pkg/providers/gcp/instance_topology_test.go
diff --git a/pkg/gcp/metrics.go b/pkg/providers/gcp/metrics.go
similarity index 100%
rename from pkg/gcp/metrics.go
rename to pkg/providers/gcp/metrics.go
diff --git a/pkg/gcp/provider.go b/pkg/providers/gcp/provider.go
similarity index 95%
rename from pkg/gcp/provider.go
rename to pkg/providers/gcp/provider.go
index cb37266..271d11a 100644
--- a/pkg/gcp/provider.go
+++ b/pkg/providers/gcp/provider.go
@@ -24,8 +24,8 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/NVIDIA/topograph/pkg/common"
-	"github.com/NVIDIA/topograph/pkg/k8s"
-	"github.com/NVIDIA/topograph/pkg/slurm"
+	"github.com/NVIDIA/topograph/pkg/engines/k8s"
+	"github.com/NVIDIA/topograph/pkg/engines/slurm"
 )
 
 type Provider struct{}
diff --git a/pkg/oci/imds.go b/pkg/providers/oci/imds.go
similarity index 100%
rename from pkg/oci/imds.go
rename to pkg/providers/oci/imds.go
diff --git a/pkg/oci/instance_topology.go b/pkg/providers/oci/instance_topology.go
similarity index 100%
rename from pkg/oci/instance_topology.go
rename to pkg/providers/oci/instance_topology.go
diff --git a/pkg/oci/metrics.go b/pkg/providers/oci/metrics.go
similarity index 100%
rename from pkg/oci/metrics.go
rename to pkg/providers/oci/metrics.go
diff --git a/pkg/oci/provider.go b/pkg/providers/oci/provider.go
similarity index 96%
rename from pkg/oci/provider.go
rename to pkg/providers/oci/provider.go
index 7dc1fbf..cc4bd8c 100644
--- a/pkg/oci/provider.go
+++ b/pkg/providers/oci/provider.go
@@ -26,8 +26,8 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/NVIDIA/topograph/pkg/common"
-	"github.com/NVIDIA/topograph/pkg/k8s"
-	"github.com/NVIDIA/topograph/pkg/slurm"
+	"github.com/NVIDIA/topograph/pkg/engines/k8s"
+	"github.com/NVIDIA/topograph/pkg/engines/slurm"
 )
 
 type Provider struct{}