diff --git a/spinifex/gateway/ec2/eigw/CreateEgressOnlyInternetGateway.go b/spinifex/domains/ec2/awsapi/eigw/CreateEgressOnlyInternetGateway.go
similarity index 97%
rename from spinifex/gateway/ec2/eigw/CreateEgressOnlyInternetGateway.go
rename to spinifex/domains/ec2/awsapi/eigw/CreateEgressOnlyInternetGateway.go
index f833e0c8f..65e144ccf 100644
--- a/spinifex/gateway/ec2/eigw/CreateEgressOnlyInternetGateway.go
+++ b/spinifex/domains/ec2/awsapi/eigw/CreateEgressOnlyInternetGateway.go
@@ -1,4 +1,4 @@
-package gateway_ec2_eigw
+package eigw
 
 import (
 	"context"
diff --git a/spinifex/gateway/ec2/eigw/DeleteEgressOnlyInternetGateway.go b/spinifex/domains/ec2/awsapi/eigw/DeleteEgressOnlyInternetGateway.go
similarity index 98%
rename from spinifex/gateway/ec2/eigw/DeleteEgressOnlyInternetGateway.go
rename to spinifex/domains/ec2/awsapi/eigw/DeleteEgressOnlyInternetGateway.go
index b68d10a28..f038b77bd 100644
--- a/spinifex/gateway/ec2/eigw/DeleteEgressOnlyInternetGateway.go
+++ b/spinifex/domains/ec2/awsapi/eigw/DeleteEgressOnlyInternetGateway.go
@@ -1,4 +1,4 @@
-package gateway_ec2_eigw
+package eigw
 
 import (
 	"context"
diff --git a/spinifex/gateway/ec2/eigw/DescribeEgressOnlyInternetGateways.go b/spinifex/domains/ec2/awsapi/eigw/DescribeEgressOnlyInternetGateways.go
similarity index 97%
rename from spinifex/gateway/ec2/eigw/DescribeEgressOnlyInternetGateways.go
rename to spinifex/domains/ec2/awsapi/eigw/DescribeEgressOnlyInternetGateways.go
index 3f0888ddb..771d792c2 100644
--- a/spinifex/gateway/ec2/eigw/DescribeEgressOnlyInternetGateways.go
+++ b/spinifex/domains/ec2/awsapi/eigw/DescribeEgressOnlyInternetGateways.go
@@ -1,4 +1,4 @@
-package gateway_ec2_eigw
+package eigw
 
 import (
 	"context"
diff --git a/spinifex/gateway/ec2/eigw/eigw_test.go b/spinifex/domains/ec2/awsapi/eigw/eigw_test.go
similarity index 99%
rename from spinifex/gateway/ec2/eigw/eigw_test.go
rename to spinifex/domains/ec2/awsapi/eigw/eigw_test.go
index ab666c0e3..597f6f157 100644
--- a/spinifex/gateway/ec2/eigw/eigw_test.go
+++ b/spinifex/domains/ec2/awsapi/eigw/eigw_test.go
@@ -1,4 +1,4 @@
-package gateway_ec2_eigw
+package eigw
 
 import (
 	"context"
diff --git a/spinifex/gateway/ec2.go b/spinifex/gateway/ec2.go
index b214d48cc..b7d1bc61e 100644
--- a/spinifex/gateway/ec2.go
+++ b/spinifex/gateway/ec2.go
@@ -15,6 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	ec2accountapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/account"
 	ec2capacityreservationapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/capacityreservation"
+	ec2eigwapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/eigw"
 	ec2keyapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/key"
 	ec2launchtemplateapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/launchtemplate"
 	ec2placementgroupapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/placementgroup"
@@ -24,7 +25,6 @@ import (
 	awsxml "github.com/mulgadc/spinifex/spinifex/foundation/aws/xml"
 	"github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency"
 	gateway_ec2 "github.com/mulgadc/spinifex/spinifex/gateway/ec2"
-	gateway_ec2_eigw "github.com/mulgadc/spinifex/spinifex/gateway/ec2/eigw"
 	gateway_ec2_eip "github.com/mulgadc/spinifex/spinifex/gateway/ec2/eip"
 	gateway_ec2_igw "github.com/mulgadc/spinifex/spinifex/gateway/ec2/igw"
 	gateway_ec2_image "github.com/mulgadc/spinifex/spinifex/gateway/ec2/image"
@@ -425,13 +425,13 @@ var ec2Actions = map[string]ec2Action{
 		return gateway_ec2_igw.DetachInternetGateway(ctx, input, gw.NATSConn, accountID)
 	}),
 	"CreateEgressOnlyInternetGateway": ec2IdempotentHandler(func(ctx context.Context, input *ec2.CreateEgressOnlyInternetGatewayInput, gw *GatewayConfig, accountID string) (ec2.CreateEgressOnlyInternetGatewayOutput, error) {
-		return gateway_ec2_eigw.CreateEgressOnlyInternetGateway(ctx, input, gw.NATSConn, accountID)
+		return ec2eigwapi.CreateEgressOnlyInternetGateway(ctx, input, gw.NATSConn, accountID)
 	}),
 	"DeleteEgressOnlyInternetGateway": ec2Handler(func(ctx context.Context, input *ec2.DeleteEgressOnlyInternetGatewayInput, gw *GatewayConfig, accountID string) (any, error) {
-		return gateway_ec2_eigw.DeleteEgressOnlyInternetGateway(ctx, input, gw.NATSConn, accountID)
+		return ec2eigwapi.DeleteEgressOnlyInternetGateway(ctx, input, gw.NATSConn, accountID)
 	}),
 	"DescribeEgressOnlyInternetGateways": ec2Handler(func(ctx context.Context, input *ec2.DescribeEgressOnlyInternetGatewaysInput, gw *GatewayConfig, accountID string) (any, error) {
-		return gateway_ec2_eigw.DescribeEgressOnlyInternetGateways(ctx, input, gw.NATSConn, accountID)
+		return ec2eigwapi.DescribeEgressOnlyInternetGateways(ctx, input, gw.NATSConn, accountID)
 	}),
 	"CreatePlacementGroup": ec2Handler(func(ctx context.Context, input *ec2.CreatePlacementGroupInput, gw *GatewayConfig, accountID string) (any, error) {
 		return ec2placementgroupapi.CreatePlacementGroup(ctx, input, gw.NATSConn, accountID)