diff --git a/spinifex/network/external/exonet/allocator.go b/spinifex/network/external/exonet/allocator.go
index ad4f240d3..58ca851d7 100644
--- a/spinifex/network/external/exonet/allocator.go
+++ b/spinifex/network/external/exonet/allocator.go
@@ -20,10 +20,10 @@ import (
 	"net/netip"
 	"strings"
 
-	"github.com/mulgadc/spinifex/spinifex/cloud/exoscale"
 	"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
 	"github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore"
 	"github.com/mulgadc/spinifex/spinifex/network/external"
+	"github.com/mulgadc/spinifex/spinifex/providers/cloud/exoscale"
 )
 
 // MarkerPrefix starts the description of every EIP this package creates.
diff --git a/spinifex/network/external/exonet/allocator_test.go b/spinifex/network/external/exonet/allocator_test.go
index 0f4871d09..791a42489 100644
--- a/spinifex/network/external/exonet/allocator_test.go
+++ b/spinifex/network/external/exonet/allocator_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mulgadc/spinifex/spinifex/cloud/exoscale"
 	"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
 	"github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore"
 	"github.com/mulgadc/spinifex/spinifex/network/external"
+	"github.com/mulgadc/spinifex/spinifex/providers/cloud/exoscale"
 )
 
 const (
diff --git a/spinifex/network/external/exonet/store_test.go b/spinifex/network/external/exonet/store_test.go
index a005bcc34..2379a037a 100644
--- a/spinifex/network/external/exonet/store_test.go
+++ b/spinifex/network/external/exonet/store_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/mulgadc/spinifex/internal/testkit"
-	"github.com/mulgadc/spinifex/spinifex/cloud/exoscale"
 	"github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore"
 	"github.com/mulgadc/spinifex/spinifex/network/external"
+	"github.com/mulgadc/spinifex/spinifex/providers/cloud/exoscale"
 )
 
 func TestKVStore_UnwrittenPoolIsNotFound(t *testing.T) {
diff --git a/spinifex/network/external/exonet/wiring.go b/spinifex/network/external/exonet/wiring.go
index 0e39e241a..50f99af4b 100644
--- a/spinifex/network/external/exonet/wiring.go
+++ b/spinifex/network/external/exonet/wiring.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/nats-io/nats.go/jetstream"
 
-	"github.com/mulgadc/spinifex/spinifex/cloud/exoscale"
 	"github.com/mulgadc/spinifex/spinifex/network/external"
+	"github.com/mulgadc/spinifex/spinifex/providers/cloud/exoscale"
 )
 
 // FromPoolConfig builds a live allocator for one source="exoscale" pool and
diff --git a/spinifex/cloud/exoscale/client.go b/spinifex/providers/cloud/exoscale/client.go
similarity index 100%
rename from spinifex/cloud/exoscale/client.go
rename to spinifex/providers/cloud/exoscale/client.go
diff --git a/spinifex/cloud/exoscale/client_test.go b/spinifex/providers/cloud/exoscale/client_test.go
similarity index 100%
rename from spinifex/cloud/exoscale/client_test.go
rename to spinifex/providers/cloud/exoscale/client_test.go
diff --git a/spinifex/cloud/exoscale/fake.go b/spinifex/providers/cloud/exoscale/fake.go
similarity index 100%
rename from spinifex/cloud/exoscale/fake.go
rename to spinifex/providers/cloud/exoscale/fake.go
diff --git a/spinifex/cloud/exoscale/fake_test.go b/spinifex/providers/cloud/exoscale/fake_test.go
similarity index 97%
rename from spinifex/cloud/exoscale/fake_test.go
rename to spinifex/providers/cloud/exoscale/fake_test.go
index fc3b1e857..fea7dca78 100644
--- a/spinifex/cloud/exoscale/fake_test.go
+++ b/spinifex/providers/cloud/exoscale/fake_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mulgadc/spinifex/spinifex/cloud/exoscale"
+	"github.com/mulgadc/spinifex/spinifex/providers/cloud/exoscale"
 )
 
 // The Fake is what every exonet test is measured against, so these pin the
diff --git a/spinifex/cloud/exoscale/testdata/create.json b/spinifex/providers/cloud/exoscale/testdata/create.json
similarity index 100%
rename from spinifex/cloud/exoscale/testdata/create.json
rename to spinifex/providers/cloud/exoscale/testdata/create.json
diff --git a/spinifex/cloud/exoscale/testdata/list.json b/spinifex/providers/cloud/exoscale/testdata/list.json
similarity index 100%
rename from spinifex/cloud/exoscale/testdata/list.json
rename to spinifex/providers/cloud/exoscale/testdata/list.json
diff --git a/spinifex/cloud/exoscale/testdata/notfound.stderr b/spinifex/providers/cloud/exoscale/testdata/notfound.stderr
similarity index 100%
rename from spinifex/cloud/exoscale/testdata/notfound.stderr
rename to spinifex/providers/cloud/exoscale/testdata/notfound.stderr
diff --git a/spinifex/cloud/exoscale/testdata/quota.stderr b/spinifex/providers/cloud/exoscale/testdata/quota.stderr
similarity index 100%
rename from spinifex/cloud/exoscale/testdata/quota.stderr
rename to spinifex/providers/cloud/exoscale/testdata/quota.stderr