diff --git a/authenticate.go b/auth-main.go
similarity index 66%
rename from authenticate.go
rename to auth-main.go
index 2347941..5806640 100644
--- a/authenticate.go
+++ b/auth-main.go
@@ -39,90 +39,6 @@ var identityCommands = []Command{
 		Description: "Login with username and password",
 		Handler:     authLocalAuthenticate,
 	},
-	{
-		Names:       []string{"attachrole"},
-		Description: "Attach Role to Identity",
-		Handler:     authAttachRoleToIdentity,
-	},
-}
-
-func authAttachRoleToIdentity(args []string) {
-	var useRole string
-	var targetIdentity string
-	var targetRole string
-
-	authAttachRoleCmd := flag.NewFlagSet("attachrole", flag.ExitOnError)
-
-	authAttachRoleCmd.StringVar(&useRole, "use-role", "", "Using role (required)")
-	authAttachRoleCmd.StringVar(&targetIdentity, "target-identity", "", "Target identity (required)")
-	authAttachRoleCmd.StringVar(&targetRole, "target-role", "", "Target role (required)")
-
-	authAttachRoleCmd.Parse(args)
-
-	if useRole == "" {
-		fmt.Println("Error: --use-role is required")
-		os.Exit(1)
-	}
-
-	if targetIdentity == "" {
-		fmt.Println("Error: --target-identity is required")
-		os.Exit(1)
-	}
-	if targetRole == "" {
-		fmt.Println("Error: --target-role is required")
-		os.Exit(1)
-	}
-
-	// Get the role token we will use
-	roleData, err := os.ReadFile("/home/farhan/.pcloud/roles/" + useRole + ".json")
-	if err != nil {
-		fmt.Printf("Error opening identity file: %v\n", err)
-		os.Exit(1)
-	}
-
-	var roleToken RoleToken
-	err = json.Unmarshal(roleData, &roleToken)
-	if err != nil {
-		fmt.Printf("Error reading identity file: %v\n", err)
-		os.Exit(1)
-	}
-
-	var attachRoleToIdentityRequest AttachRoleToIdentityRequest
-
-	attachRoleToIdentityRequest.Identity = targetIdentity
-	attachRoleToIdentityRequest.Role = targetRole
-
-	attachRoleToIdentityRequestData, err := json.Marshal(attachRoleToIdentityRequest)
-	if err != nil {
-		fmt.Println("Error encoding JSON:", err)
-		os.Exit(1)
-	}
-	url := endpoint + "/identity/allow-role-to-identity"
-	req, err := http.NewRequest("POST", url, bytes.NewBuffer(attachRoleToIdentityRequestData))
-	if err != nil {
-		log.Fatal("Error creating request:", err)
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+roleToken.Token)
-
-	// Set headers
-	req.Header.Set("Content-Type", "application/json")
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		log.Fatal("Error making request:", err)
-	}
-	defer resp.Body.Close()
-
-	fmt.Println("Response status:", resp.Status)
-
-	if resp.StatusCode != http.StatusOK {
-		log.Fatal("Attach role to identity failed with status:", resp.Status)
-	}
-	//	fmt.Printf("Attaching role %s to identity %s\n", targetRole, targetIdentity)
-
 }
 
 func authLocalAuthenticate(args []string) {
diff --git a/main.go b/main.go
index a83050b..016dd1f 100644
--- a/main.go
+++ b/main.go
@@ -21,7 +21,7 @@ var commands = []Command{
 		Handler:     roleMain,
 	},
 	{
-		Names:       []string{"authenticate", "authentication", "auth"},
+		Names:       []string{"authenticate", "auth"},
 		Description: "Authentication Management",
 		Handler:     authenticateMain,
 	},
diff --git a/role-attach-role-to-identity.go b/role-attach-role-to-identity.go
new file mode 100644
index 0000000..688790e
--- /dev/null
+++ b/role-attach-role-to-identity.go
@@ -0,0 +1,90 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+)
+
+func authAttachRoleToIdentity(args []string) {
+	var useRole string
+	var targetIdentity string
+	var targetRole string
+
+	authAttachRoleCmd := flag.NewFlagSet("attachrole", flag.ExitOnError)
+
+	authAttachRoleCmd.StringVar(&useRole, "use-role", "", "Using role (required)")
+	authAttachRoleCmd.StringVar(&targetIdentity, "target-identity", "", "Target identity (required)")
+	authAttachRoleCmd.StringVar(&targetRole, "target-role", "", "Target role (required)")
+
+	authAttachRoleCmd.Parse(args)
+
+	if useRole == "" {
+		fmt.Println("Error: --use-role is required")
+		os.Exit(1)
+	}
+
+	if targetIdentity == "" {
+		fmt.Println("Error: --target-identity is required")
+		os.Exit(1)
+	}
+	if targetRole == "" {
+		fmt.Println("Error: --target-role is required")
+		os.Exit(1)
+	}
+
+	// Get the role token we will use
+	roleData, err := os.ReadFile("/home/farhan/.pcloud/roles/" + useRole + ".json")
+	if err != nil {
+		fmt.Printf("Error opening identity file: %v\n", err)
+		os.Exit(1)
+	}
+
+	var roleToken RoleToken
+	err = json.Unmarshal(roleData, &roleToken)
+	if err != nil {
+		fmt.Printf("Error reading identity file: %v\n", err)
+		os.Exit(1)
+	}
+
+	var attachRoleToIdentityRequest AttachRoleToIdentityRequest
+
+	attachRoleToIdentityRequest.Identity = targetIdentity
+	attachRoleToIdentityRequest.Role = targetRole
+
+	attachRoleToIdentityRequestData, err := json.Marshal(attachRoleToIdentityRequest)
+	if err != nil {
+		fmt.Println("Error encoding JSON:", err)
+		os.Exit(1)
+	}
+	url := endpoint + "/identity/allow-role-to-identity"
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(attachRoleToIdentityRequestData))
+	if err != nil {
+		log.Fatal("Error creating request:", err)
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Authorization", "Bearer "+roleToken.Token)
+
+	// Set headers
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		log.Fatal("Error making request:", err)
+	}
+	defer resp.Body.Close()
+
+	fmt.Println("Response status:", resp.Status)
+
+	if resp.StatusCode != http.StatusOK {
+		log.Fatal("Attach role to identity failed with status:", resp.Status)
+	}
+	//	fmt.Printf("Attaching role %s to identity %s\n", targetRole, targetIdentity)
+
+}
diff --git a/role.go b/role.go
index 35674d1..8067a06 100644
--- a/role.go
+++ b/role.go
@@ -36,6 +36,11 @@ var roleCommands = []Command{
 		Description: "Role Management",
 		Handler:     assumeRole,
 	},
+	{
+		Names:       []string{"attach-roletoidentity"},
+		Description: "Attach Role to Identity",
+		Handler:     authAttachRoleToIdentity,
+	},
 }
 
 func assumeRole(args []string) {