diff --git a/s3x/service.go b/aws/s3x/service.go
similarity index 100%
rename from s3x/service.go
rename to aws/s3x/service.go
diff --git a/s3x/service_test.go b/aws/s3x/service_test.go
similarity index 98%
rename from s3x/service_test.go
rename to aws/s3x/service_test.go
index d997e2c..93b8106 100644
--- a/s3x/service_test.go
+++ b/aws/s3x/service_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/nyaruka/gocommon/s3x"
+	"github.com/nyaruka/gocommon/aws/s3x"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/s3x/urls.go b/aws/s3x/urls.go
similarity index 100%
rename from s3x/urls.go
rename to aws/s3x/urls.go
diff --git a/s3x/urls_test.go b/aws/s3x/urls_test.go
similarity index 91%
rename from s3x/urls_test.go
rename to aws/s3x/urls_test.go
index 4d2e6ce..5d643a5 100644
--- a/s3x/urls_test.go
+++ b/aws/s3x/urls_test.go
@@ -3,7 +3,7 @@ package s3x_test
 import (
 	"testing"
 
-	"github.com/nyaruka/gocommon/s3x"
+	"github.com/nyaruka/gocommon/aws/s3x"
 	"github.com/stretchr/testify/assert"
 )