diff --git a/spinifex/gateway/ec2/tags/CreateTags.go b/spinifex/domains/ec2/awsapi/tags/CreateTags.go
similarity index 98%
rename from spinifex/gateway/ec2/tags/CreateTags.go
rename to spinifex/domains/ec2/awsapi/tags/CreateTags.go
index 98982a317..22104c150 100644
--- a/spinifex/gateway/ec2/tags/CreateTags.go
+++ b/spinifex/domains/ec2/awsapi/tags/CreateTags.go
@@ -1,4 +1,4 @@
-package gateway_ec2_tags
+package tags
 
 import (
 	"context"
diff --git a/spinifex/gateway/ec2/tags/CreateTags_test.go b/spinifex/domains/ec2/awsapi/tags/CreateTags_test.go
similarity index 99%
rename from spinifex/gateway/ec2/tags/CreateTags_test.go
rename to spinifex/domains/ec2/awsapi/tags/CreateTags_test.go
index 8a4f94ffb..354cd24d8 100644
--- a/spinifex/gateway/ec2/tags/CreateTags_test.go
+++ b/spinifex/domains/ec2/awsapi/tags/CreateTags_test.go
@@ -1,4 +1,4 @@
-package gateway_ec2_tags
+package tags
 
 import (
 	"testing"
diff --git a/spinifex/gateway/ec2/tags/DeleteTags.go b/spinifex/domains/ec2/awsapi/tags/DeleteTags.go
similarity index 97%
rename from spinifex/gateway/ec2/tags/DeleteTags.go
rename to spinifex/domains/ec2/awsapi/tags/DeleteTags.go
index df2cdc871..e2a0c47bf 100644
--- a/spinifex/gateway/ec2/tags/DeleteTags.go
+++ b/spinifex/domains/ec2/awsapi/tags/DeleteTags.go
@@ -1,4 +1,4 @@
-package gateway_ec2_tags
+package tags
 
 import (
 	"context"
diff --git a/spinifex/gateway/ec2/tags/DescribeTags.go b/spinifex/domains/ec2/awsapi/tags/DescribeTags.go
similarity index 95%
rename from spinifex/gateway/ec2/tags/DescribeTags.go
rename to spinifex/domains/ec2/awsapi/tags/DescribeTags.go
index 94277288d..a5377a080 100644
--- a/spinifex/gateway/ec2/tags/DescribeTags.go
+++ b/spinifex/domains/ec2/awsapi/tags/DescribeTags.go
@@ -1,4 +1,4 @@
-package gateway_ec2_tags
+package tags
 
 import (
 	"context"
diff --git a/spinifex/gateway/ec2/tags/tags_test.go b/spinifex/domains/ec2/awsapi/tags/tags_test.go
similarity index 98%
rename from spinifex/gateway/ec2/tags/tags_test.go
rename to spinifex/domains/ec2/awsapi/tags/tags_test.go
index a40eed664..3cdf06934 100644
--- a/spinifex/gateway/ec2/tags/tags_test.go
+++ b/spinifex/domains/ec2/awsapi/tags/tags_test.go
@@ -1,4 +1,4 @@
-package gateway_ec2_tags
+package tags
 
 import (
 	"context"
diff --git a/spinifex/gateway/ec2.go b/spinifex/gateway/ec2.go
index 38a66b480..5d8f3dd8c 100644
--- a/spinifex/gateway/ec2.go
+++ b/spinifex/gateway/ec2.go
@@ -25,6 +25,7 @@ import (
 	ec2placementgroupapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/placementgroup"
 	ec2routetableapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/routetable"
 	ec2snapshotapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/snapshot"
+	ec2tagsapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/tags"
 	ec2volumeapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/volume"
 	ec2vpcapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/vpc"
 	ec2zoneapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/zone"
@@ -34,7 +35,6 @@ import (
 	gateway_ec2 "github.com/mulgadc/spinifex/spinifex/gateway/ec2"
 	gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance"
 	gateway_ec2_spotinstance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/spotinstance"
-	gateway_ec2_tags "github.com/mulgadc/spinifex/spinifex/gateway/ec2/tags"
 	handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota"
 	"github.com/mulgadc/spinifex/spinifex/ingress/aws/query"
 	"github.com/nats-io/nats.go"
@@ -389,13 +389,13 @@ var ec2Actions = map[string]ec2Action{
 		return ec2accountapi.DisableSerialConsoleAccess(ctx, input, gw.NATSConn, accountID)
 	}),
 	"CreateTags": ec2Handler(func(ctx context.Context, input *ec2.CreateTagsInput, gw *GatewayConfig, accountID string) (any, error) {
-		return gateway_ec2_tags.CreateTags(ctx, input, gw.NATSConn, accountID)
+		return ec2tagsapi.CreateTags(ctx, input, gw.NATSConn, accountID)
 	}),
 	"DeleteTags": ec2Handler(func(ctx context.Context, input *ec2.DeleteTagsInput, gw *GatewayConfig, accountID string) (any, error) {
-		return gateway_ec2_tags.DeleteTags(ctx, input, gw.NATSConn, accountID)
+		return ec2tagsapi.DeleteTags(ctx, input, gw.NATSConn, accountID)
 	}),
 	"DescribeTags": ec2Handler(func(ctx context.Context, input *ec2.DescribeTagsInput, gw *GatewayConfig, accountID string) (any, error) {
-		return gateway_ec2_tags.DescribeTags(ctx, input, gw.NATSConn, accountID)
+		return ec2tagsapi.DescribeTags(ctx, input, gw.NATSConn, accountID)
 	}),
 	"CreateSnapshot": ec2Handler(func(ctx context.Context, input *ec2.CreateSnapshotInput, gw *GatewayConfig, accountID string) (any, error) {
 		return ec2snapshotapi.CreateSnapshot(ctx, input, gw.NATSConn, accountID)