diff --git a/internal/client/aws.go b/internal/aws/aws.go
similarity index 99%
rename from internal/client/aws.go
rename to internal/aws/aws.go
index b3ffad0..0a4e267 100644
--- a/internal/client/aws.go
+++ b/internal/aws/aws.go
@@ -1,4 +1,4 @@
-package client
+package aws
 
 import (
 	"bytes"
diff --git a/internal/client/client.go b/internal/aws/client.go
similarity index 99%
rename from internal/client/client.go
rename to internal/aws/client.go
index a790291..2abff2e 100644
--- a/internal/client/client.go
+++ b/internal/aws/client.go
@@ -1,4 +1,4 @@
-package client
+package aws
 
 import (
 	"context"
diff --git a/internal/controller/irsasetup_controller.go b/internal/controller/irsasetup_controller.go
index a17820a..ce950af 100644
--- a/internal/controller/irsasetup_controller.go
+++ b/internal/controller/irsasetup_controller.go
@@ -26,7 +26,7 @@ import (
 	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
 
 	irsav1alpha1 "github.com/kkb0318/irsa-manager/api/v1alpha1"
-	awsclient "github.com/kkb0318/irsa-manager/internal/client"
+	awsclient "github.com/kkb0318/irsa-manager/internal/aws"
 	"github.com/kkb0318/irsa-manager/internal/handler"
 	"github.com/kkb0318/irsa-manager/internal/kubernetes"
 	"github.com/kkb0318/irsa-manager/internal/manifests"
diff --git a/internal/controller/irsasetup_controller_test.go b/internal/controller/irsasetup_controller_test.go
index ab5646b..23850c4 100644
--- a/internal/controller/irsasetup_controller_test.go
+++ b/internal/controller/irsasetup_controller_test.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	awsclient "github.com/kkb0318/irsa-manager/internal/client"
+	awsclient "github.com/kkb0318/irsa-manager/internal/aws"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	irsav1alpha1 "github.com/kkb0318/irsa-manager/api/v1alpha1"
diff --git a/internal/selfhosted/oidc/factory.go b/internal/selfhosted/oidc/factory.go
index 7908cfd..9f70bcb 100644
--- a/internal/selfhosted/oidc/factory.go
+++ b/internal/selfhosted/oidc/factory.go
@@ -3,7 +3,7 @@ package oidc
 import (
 	"context"
 
-	awsclient "github.com/kkb0318/irsa-manager/internal/client"
+	awsclient "github.com/kkb0318/irsa-manager/internal/aws"
 	"github.com/kkb0318/irsa-manager/internal/selfhosted"
 )
 
diff --git a/internal/selfhosted/oidc/id_provider.go b/internal/selfhosted/oidc/id_provider.go
index 1e321ff..b98d5bb 100644
--- a/internal/selfhosted/oidc/id_provider.go
+++ b/internal/selfhosted/oidc/id_provider.go
@@ -3,17 +3,17 @@ package oidc
 import (
 	"context"
 
-	"github.com/kkb0318/irsa-manager/internal/client"
+	awsclient "github.com/kkb0318/irsa-manager/internal/aws"
 	"github.com/kkb0318/irsa-manager/internal/selfhosted"
 )
 
 type AwsIdP struct {
-	iamClient  *client.AwsIamClient
-	stsClient  *client.AwsStsClient
+	iamClient  *awsclient.AwsIamClient
+	stsClient  *awsclient.AwsStsClient
 	issuerMeta selfhosted.OIDCIssuerMeta
 }
 
-func NewAwsIdP(awsConfig client.AwsClient, issuerMeta selfhosted.OIDCIssuerMeta) (*AwsIdP, error) {
+func NewAwsIdP(awsConfig awsclient.AwsClient, issuerMeta selfhosted.OIDCIssuerMeta) (*AwsIdP, error) {
 	iamClient := awsConfig.IamClient()
 	stsClient := awsConfig.StsClient()
 	return &AwsIdP{iamClient, stsClient, issuerMeta}, nil
diff --git a/internal/selfhosted/oidc/id_provider_discovery.go b/internal/selfhosted/oidc/id_provider_discovery.go
index 90dc50c..d118ed3 100644
--- a/internal/selfhosted/oidc/id_provider_discovery.go
+++ b/internal/selfhosted/oidc/id_provider_discovery.go
@@ -4,19 +4,19 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/kkb0318/irsa-manager/internal/client"
+	awsclient "github.com/kkb0318/irsa-manager/internal/aws"
 	"github.com/kkb0318/irsa-manager/internal/selfhosted"
 )
 
 const CONFIGURATION_PATH = ".well-known/openid-configuration"
 
 type S3IdPDiscovery struct {
-	s3Client *client.AwsS3Client
+	s3Client *awsclient.AwsS3Client
 }
 
 // NewS3IdPDiscovery initializes a new instance of S3IdPCreator with the specified AWS region and bucket name.
 // This function attempts to create an AWS client configured for the specified region.
-func NewS3IdPDiscovery(awsConfig client.AwsClient, region, bucketName string) *S3IdPDiscovery {
+func NewS3IdPDiscovery(awsConfig awsclient.AwsClient, region, bucketName string) *S3IdPDiscovery {
 	s3Client := awsConfig.S3Client(region, bucketName)
 	return &S3IdPDiscovery{s3Client}
 }
@@ -41,7 +41,7 @@ func (s *S3IdPDiscovery) Upload(ctx context.Context, o selfhosted.OIDCIdPDiscove
 	if err != nil {
 		return nil
 	}
-	inputs := []client.ObjectInput{
+	inputs := []awsclient.ObjectInput{
 		{
 			Key:  CONFIGURATION_PATH,
 			Body: discovery,