diff --git a/cmd/atlas/atlas.go b/cmd/atlas/atlas.go
index 85b37b2500..06a1d1bc3a 100644
--- a/cmd/atlas/atlas.go
+++ b/cmd/atlas/atlas.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/AlecAivazis/survey/v2/core"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/root/atlas"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/root"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/telemetry"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/terminal"
@@ -35,7 +35,7 @@ import (
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
 	ctx := telemetry.NewContext()
-	rootCmd := atlas.Builder()
+	rootCmd := root.Builder()
 	// append here to avoid a recursive link on generated docs
 	rootCmd.Long += `
 
@@ -158,7 +158,7 @@ func trackInitError(e error) {
 	if e == nil {
 		return
 	}
-	if cmd, args, err := atlas.Builder().Find(os.Args[1:]); err == nil {
+	if cmd, args, err := root.Builder().Find(os.Args[1:]); err == nil {
 		if !telemetry.StartedTrackingCommand() {
 			telemetry.StartTrackingCommand(cmd, args)
 		}
@@ -170,7 +170,7 @@ func trackInitError(e error) {
 }
 
 func initTrack() {
-	cmd, args, _ := atlas.Builder().Find(os.Args[1:])
+	cmd, args, _ := root.Builder().Find(os.Args[1:])
 	telemetry.StartTrackingCommand(cmd, args)
 }
 
diff --git a/internal/cli/atlas/accesslists/access_lists.go b/internal/cli/accesslists/access_lists.go
similarity index 100%
rename from internal/cli/atlas/accesslists/access_lists.go
rename to internal/cli/accesslists/access_lists.go
diff --git a/internal/cli/atlas/accesslists/access_lists_test.go b/internal/cli/accesslists/access_lists_test.go
similarity index 100%
rename from internal/cli/atlas/accesslists/access_lists_test.go
rename to internal/cli/accesslists/access_lists_test.go
diff --git a/internal/cli/atlas/accesslists/create.go b/internal/cli/accesslists/create.go
similarity index 100%
rename from internal/cli/atlas/accesslists/create.go
rename to internal/cli/accesslists/create.go
diff --git a/internal/cli/atlas/accesslists/create_test.go b/internal/cli/accesslists/create_test.go
similarity index 100%
rename from internal/cli/atlas/accesslists/create_test.go
rename to internal/cli/accesslists/create_test.go
diff --git a/internal/cli/atlas/accesslists/delete.go b/internal/cli/accesslists/delete.go
similarity index 100%
rename from internal/cli/atlas/accesslists/delete.go
rename to internal/cli/accesslists/delete.go
diff --git a/internal/cli/atlas/accesslists/delete_test.go b/internal/cli/accesslists/delete_test.go
similarity index 100%
rename from internal/cli/atlas/accesslists/delete_test.go
rename to internal/cli/accesslists/delete_test.go
diff --git a/internal/cli/atlas/accesslists/describe.go b/internal/cli/accesslists/describe.go
similarity index 100%
rename from internal/cli/atlas/accesslists/describe.go
rename to internal/cli/accesslists/describe.go
diff --git a/internal/cli/atlas/accesslists/describe_test.go b/internal/cli/accesslists/describe_test.go
similarity index 100%
rename from internal/cli/atlas/accesslists/describe_test.go
rename to internal/cli/accesslists/describe_test.go
diff --git a/internal/cli/atlas/accesslists/list.go b/internal/cli/accesslists/list.go
similarity index 100%
rename from internal/cli/atlas/accesslists/list.go
rename to internal/cli/accesslists/list.go
diff --git a/internal/cli/atlas/accesslists/list_test.go b/internal/cli/accesslists/list_test.go
similarity index 100%
rename from internal/cli/atlas/accesslists/list_test.go
rename to internal/cli/accesslists/list_test.go
diff --git a/internal/cli/atlas/accesslogs/access_logs.go b/internal/cli/accesslogs/access_logs.go
similarity index 100%
rename from internal/cli/atlas/accesslogs/access_logs.go
rename to internal/cli/accesslogs/access_logs.go
diff --git a/internal/cli/atlas/accesslogs/access_logs_test.go b/internal/cli/accesslogs/access_logs_test.go
similarity index 100%
rename from internal/cli/atlas/accesslogs/access_logs_test.go
rename to internal/cli/accesslogs/access_logs_test.go
diff --git a/internal/cli/atlas/accesslogs/list.go b/internal/cli/accesslogs/list.go
similarity index 100%
rename from internal/cli/atlas/accesslogs/list.go
rename to internal/cli/accesslogs/list.go
diff --git a/internal/cli/atlas/accesslogs/list_test.go b/internal/cli/accesslogs/list_test.go
similarity index 100%
rename from internal/cli/atlas/accesslogs/list_test.go
rename to internal/cli/accesslogs/list_test.go
diff --git a/internal/cli/atlas/alerts/acknowledge.go b/internal/cli/alerts/acknowledge.go
similarity index 100%
rename from internal/cli/atlas/alerts/acknowledge.go
rename to internal/cli/alerts/acknowledge.go
diff --git a/internal/cli/atlas/alerts/acknowledge_test.go b/internal/cli/alerts/acknowledge_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/acknowledge_test.go
rename to internal/cli/alerts/acknowledge_test.go
diff --git a/internal/cli/atlas/alerts/alerts.go b/internal/cli/alerts/alerts.go
similarity index 92%
rename from internal/cli/atlas/alerts/alerts.go
rename to internal/cli/alerts/alerts.go
index 264047f0b4..299f5e6cf9 100644
--- a/internal/cli/atlas/alerts/alerts.go
+++ b/internal/cli/alerts/alerts.go
@@ -16,7 +16,7 @@ package alerts
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/alerts/settings"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/alerts/settings"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/alerts/alerts_test.go b/internal/cli/alerts/alerts_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/alerts_test.go
rename to internal/cli/alerts/alerts_test.go
diff --git a/internal/cli/atlas/alerts/describe.go b/internal/cli/alerts/describe.go
similarity index 100%
rename from internal/cli/atlas/alerts/describe.go
rename to internal/cli/alerts/describe.go
diff --git a/internal/cli/atlas/alerts/describe_test.go b/internal/cli/alerts/describe_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/describe_test.go
rename to internal/cli/alerts/describe_test.go
diff --git a/internal/cli/atlas/alerts/list.go b/internal/cli/alerts/list.go
similarity index 100%
rename from internal/cli/atlas/alerts/list.go
rename to internal/cli/alerts/list.go
diff --git a/internal/cli/atlas/alerts/list_test.go b/internal/cli/alerts/list_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/list_test.go
rename to internal/cli/alerts/list_test.go
diff --git a/internal/cli/atlas/alerts/settings/create.go b/internal/cli/alerts/settings/create.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/create.go
rename to internal/cli/alerts/settings/create.go
diff --git a/internal/cli/atlas/alerts/settings/create_test.go b/internal/cli/alerts/settings/create_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/create_test.go
rename to internal/cli/alerts/settings/create_test.go
diff --git a/internal/cli/atlas/alerts/settings/delete.go b/internal/cli/alerts/settings/delete.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/delete.go
rename to internal/cli/alerts/settings/delete.go
diff --git a/internal/cli/atlas/alerts/settings/delete_test.go b/internal/cli/alerts/settings/delete_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/delete_test.go
rename to internal/cli/alerts/settings/delete_test.go
diff --git a/internal/cli/atlas/alerts/settings/describe.go b/internal/cli/alerts/settings/describe.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/describe.go
rename to internal/cli/alerts/settings/describe.go
diff --git a/internal/cli/atlas/alerts/settings/describe_test.go b/internal/cli/alerts/settings/describe_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/describe_test.go
rename to internal/cli/alerts/settings/describe_test.go
diff --git a/internal/cli/atlas/alerts/settings/disable.go b/internal/cli/alerts/settings/disable.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/disable.go
rename to internal/cli/alerts/settings/disable.go
diff --git a/internal/cli/atlas/alerts/settings/disable_test.go b/internal/cli/alerts/settings/disable_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/disable_test.go
rename to internal/cli/alerts/settings/disable_test.go
diff --git a/internal/cli/atlas/alerts/settings/enable.go b/internal/cli/alerts/settings/enable.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/enable.go
rename to internal/cli/alerts/settings/enable.go
diff --git a/internal/cli/atlas/alerts/settings/enable_test.go b/internal/cli/alerts/settings/enable_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/enable_test.go
rename to internal/cli/alerts/settings/enable_test.go
diff --git a/internal/cli/atlas/alerts/settings/fields.go b/internal/cli/alerts/settings/fields.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/fields.go
rename to internal/cli/alerts/settings/fields.go
diff --git a/internal/cli/atlas/alerts/settings/fields_type.go b/internal/cli/alerts/settings/fields_type.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/fields_type.go
rename to internal/cli/alerts/settings/fields_type.go
diff --git a/internal/cli/atlas/alerts/settings/fields_type_test.go b/internal/cli/alerts/settings/fields_type_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/fields_type_test.go
rename to internal/cli/alerts/settings/fields_type_test.go
diff --git a/internal/cli/atlas/alerts/settings/list.go b/internal/cli/alerts/settings/list.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/list.go
rename to internal/cli/alerts/settings/list.go
diff --git a/internal/cli/atlas/alerts/settings/list_test.go b/internal/cli/alerts/settings/list_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/list_test.go
rename to internal/cli/alerts/settings/list_test.go
diff --git a/internal/cli/atlas/alerts/settings/settings.go b/internal/cli/alerts/settings/settings.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/settings.go
rename to internal/cli/alerts/settings/settings.go
diff --git a/internal/cli/atlas/alerts/settings/settings_test.go b/internal/cli/alerts/settings/settings_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/settings_test.go
rename to internal/cli/alerts/settings/settings_test.go
diff --git a/internal/cli/atlas/alerts/settings/update.go b/internal/cli/alerts/settings/update.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/update.go
rename to internal/cli/alerts/settings/update.go
diff --git a/internal/cli/atlas/alerts/settings/update_test.go b/internal/cli/alerts/settings/update_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/update_test.go
rename to internal/cli/alerts/settings/update_test.go
diff --git a/internal/cli/atlas/alerts/settings/validator.go b/internal/cli/alerts/settings/validator.go
similarity index 100%
rename from internal/cli/atlas/alerts/settings/validator.go
rename to internal/cli/alerts/settings/validator.go
diff --git a/internal/cli/atlas/alerts/unacknowledge.go b/internal/cli/alerts/unacknowledge.go
similarity index 100%
rename from internal/cli/atlas/alerts/unacknowledge.go
rename to internal/cli/alerts/unacknowledge.go
diff --git a/internal/cli/atlas/alerts/unacknowledge_test.go b/internal/cli/alerts/unacknowledge_test.go
similarity index 100%
rename from internal/cli/atlas/alerts/unacknowledge_test.go
rename to internal/cli/alerts/unacknowledge_test.go
diff --git a/internal/cli/atlas/auditing/auditing.go b/internal/cli/auditing/auditing.go
similarity index 100%
rename from internal/cli/atlas/auditing/auditing.go
rename to internal/cli/auditing/auditing.go
diff --git a/internal/cli/atlas/auditing/auditing_test.go b/internal/cli/auditing/auditing_test.go
similarity index 100%
rename from internal/cli/atlas/auditing/auditing_test.go
rename to internal/cli/auditing/auditing_test.go
diff --git a/internal/cli/atlas/auditing/describe.go b/internal/cli/auditing/describe.go
similarity index 100%
rename from internal/cli/atlas/auditing/describe.go
rename to internal/cli/auditing/describe.go
diff --git a/internal/cli/atlas/auditing/describe_test.go b/internal/cli/auditing/describe_test.go
similarity index 100%
rename from internal/cli/atlas/auditing/describe_test.go
rename to internal/cli/auditing/describe_test.go
diff --git a/internal/cli/atlas/backup/backup.go b/internal/cli/backup/backup.go
similarity index 72%
rename from internal/cli/atlas/backup/backup.go
rename to internal/cli/backup/backup.go
index cbde2db082..d2dd112859 100644
--- a/internal/cli/atlas/backup/backup.go
+++ b/internal/cli/backup/backup.go
@@ -16,11 +16,11 @@ package backup
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/exports"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/restores"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/schedule"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/snapshots"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/exports"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/restores"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/schedule"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/snapshots"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/backup/backup_test.go b/internal/cli/backup/backup_test.go
similarity index 100%
rename from internal/cli/atlas/backup/backup_test.go
rename to internal/cli/backup/backup_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/compliancepolicy.go b/internal/cli/backup/compliancepolicy/compliancepolicy.go
similarity index 76%
rename from internal/cli/atlas/backup/compliancepolicy/compliancepolicy.go
rename to internal/cli/backup/compliancepolicy/compliancepolicy.go
index b066348304..251afe01d6 100644
--- a/internal/cli/atlas/backup/compliancepolicy/compliancepolicy.go
+++ b/internal/cli/backup/compliancepolicy/compliancepolicy.go
@@ -16,10 +16,10 @@ package compliancepolicy
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/copyprotection"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/encryptionatrest"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/pointintimerestore"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/policies"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/copyprotection"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/encryptionatrest"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/pointintimerestore"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/policies"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/backup/compliancepolicy/compliancepolicy_test.go b/internal/cli/backup/compliancepolicy/compliancepolicy_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/compliancepolicy_test.go
rename to internal/cli/backup/compliancepolicy/compliancepolicy_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/copyprotection/copyprotection.go b/internal/cli/backup/compliancepolicy/copyprotection/copyprotection.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/copyprotection/copyprotection.go
rename to internal/cli/backup/compliancepolicy/copyprotection/copyprotection.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/copyprotection/copyprotection_test.go b/internal/cli/backup/compliancepolicy/copyprotection/copyprotection_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/copyprotection/copyprotection_test.go
rename to internal/cli/backup/compliancepolicy/copyprotection/copyprotection_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/copyprotection/disable.go b/internal/cli/backup/compliancepolicy/copyprotection/disable.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/copyprotection/disable.go
rename to internal/cli/backup/compliancepolicy/copyprotection/disable.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/copyprotection/disable_test.go b/internal/cli/backup/compliancepolicy/copyprotection/disable_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/copyprotection/disable_test.go
rename to internal/cli/backup/compliancepolicy/copyprotection/disable_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/copyprotection/enable.go b/internal/cli/backup/compliancepolicy/copyprotection/enable.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/copyprotection/enable.go
rename to internal/cli/backup/compliancepolicy/copyprotection/enable.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/copyprotection/enable_test.go b/internal/cli/backup/compliancepolicy/copyprotection/enable_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/copyprotection/enable_test.go
rename to internal/cli/backup/compliancepolicy/copyprotection/enable_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/describe.go b/internal/cli/backup/compliancepolicy/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/describe.go
rename to internal/cli/backup/compliancepolicy/describe.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/describe_test.go b/internal/cli/backup/compliancepolicy/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/describe_test.go
rename to internal/cli/backup/compliancepolicy/describe_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/enable.go b/internal/cli/backup/compliancepolicy/enable.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/enable.go
rename to internal/cli/backup/compliancepolicy/enable.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/enable_test.go b/internal/cli/backup/compliancepolicy/enable_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/enable_test.go
rename to internal/cli/backup/compliancepolicy/enable_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/encryptionatrest/disable.go b/internal/cli/backup/compliancepolicy/encryptionatrest/disable.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/encryptionatrest/disable.go
rename to internal/cli/backup/compliancepolicy/encryptionatrest/disable.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/encryptionatrest/disable_test.go b/internal/cli/backup/compliancepolicy/encryptionatrest/disable_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/encryptionatrest/disable_test.go
rename to internal/cli/backup/compliancepolicy/encryptionatrest/disable_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/encryptionatrest/enable.go b/internal/cli/backup/compliancepolicy/encryptionatrest/enable.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/encryptionatrest/enable.go
rename to internal/cli/backup/compliancepolicy/encryptionatrest/enable.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/encryptionatrest/enable_test.go b/internal/cli/backup/compliancepolicy/encryptionatrest/enable_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/encryptionatrest/enable_test.go
rename to internal/cli/backup/compliancepolicy/encryptionatrest/enable_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/encryptionatrest/encryptionatrest.go b/internal/cli/backup/compliancepolicy/encryptionatrest/encryptionatrest.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/encryptionatrest/encryptionatrest.go
rename to internal/cli/backup/compliancepolicy/encryptionatrest/encryptionatrest.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/encryptionatrest/encryptionatrest_test.go b/internal/cli/backup/compliancepolicy/encryptionatrest/encryptionatrest_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/encryptionatrest/encryptionatrest_test.go
rename to internal/cli/backup/compliancepolicy/encryptionatrest/encryptionatrest_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/pointintimerestore/enable.go b/internal/cli/backup/compliancepolicy/pointintimerestore/enable.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/pointintimerestore/enable.go
rename to internal/cli/backup/compliancepolicy/pointintimerestore/enable.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/pointintimerestore/enable_test.go b/internal/cli/backup/compliancepolicy/pointintimerestore/enable_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/pointintimerestore/enable_test.go
rename to internal/cli/backup/compliancepolicy/pointintimerestore/enable_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/pointintimerestore/pointintimerestore.go b/internal/cli/backup/compliancepolicy/pointintimerestore/pointintimerestore.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/pointintimerestore/pointintimerestore.go
rename to internal/cli/backup/compliancepolicy/pointintimerestore/pointintimerestore.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/pointintimerestore/pointintimerestore_test.go b/internal/cli/backup/compliancepolicy/pointintimerestore/pointintimerestore_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/pointintimerestore/pointintimerestore_test.go
rename to internal/cli/backup/compliancepolicy/pointintimerestore/pointintimerestore_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/describe.go b/internal/cli/backup/compliancepolicy/policies/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/describe.go
rename to internal/cli/backup/compliancepolicy/policies/describe.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/describe_test.go b/internal/cli/backup/compliancepolicy/policies/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/describe_test.go
rename to internal/cli/backup/compliancepolicy/policies/describe_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/ondemand/create.go b/internal/cli/backup/compliancepolicy/policies/ondemand/create.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/ondemand/create.go
rename to internal/cli/backup/compliancepolicy/policies/ondemand/create.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/ondemand/create_test.go b/internal/cli/backup/compliancepolicy/policies/ondemand/create_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/ondemand/create_test.go
rename to internal/cli/backup/compliancepolicy/policies/ondemand/create_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/ondemand/describe.go b/internal/cli/backup/compliancepolicy/policies/ondemand/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/ondemand/describe.go
rename to internal/cli/backup/compliancepolicy/policies/ondemand/describe.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/ondemand/describe_test.go b/internal/cli/backup/compliancepolicy/policies/ondemand/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/ondemand/describe_test.go
rename to internal/cli/backup/compliancepolicy/policies/ondemand/describe_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/ondemand/ondemand.go b/internal/cli/backup/compliancepolicy/policies/ondemand/ondemand.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/ondemand/ondemand.go
rename to internal/cli/backup/compliancepolicy/policies/ondemand/ondemand.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/ondemand/ondemand_test.go b/internal/cli/backup/compliancepolicy/policies/ondemand/ondemand_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/ondemand/ondemand_test.go
rename to internal/cli/backup/compliancepolicy/policies/ondemand/ondemand_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/ondemand/update.go b/internal/cli/backup/compliancepolicy/policies/ondemand/update.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/ondemand/update.go
rename to internal/cli/backup/compliancepolicy/policies/ondemand/update.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/ondemand/update_test.go b/internal/cli/backup/compliancepolicy/policies/ondemand/update_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/ondemand/update_test.go
rename to internal/cli/backup/compliancepolicy/policies/ondemand/update_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/policies.go b/internal/cli/backup/compliancepolicy/policies/policies.go
similarity index 83%
rename from internal/cli/atlas/backup/compliancepolicy/policies/policies.go
rename to internal/cli/backup/compliancepolicy/policies/policies.go
index 721a8a8fb4..23ab7c91fd 100644
--- a/internal/cli/atlas/backup/compliancepolicy/policies/policies.go
+++ b/internal/cli/backup/compliancepolicy/policies/policies.go
@@ -16,8 +16,8 @@ package policies
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/policies/ondemand"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/policies/scheduled"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/policies/ondemand"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/policies/scheduled"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/policies_test.go b/internal/cli/backup/compliancepolicy/policies/policies_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/policies_test.go
rename to internal/cli/backup/compliancepolicy/policies/policies_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/scheduled/create.go b/internal/cli/backup/compliancepolicy/policies/scheduled/create.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/scheduled/create.go
rename to internal/cli/backup/compliancepolicy/policies/scheduled/create.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/scheduled/create_test.go b/internal/cli/backup/compliancepolicy/policies/scheduled/create_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/scheduled/create_test.go
rename to internal/cli/backup/compliancepolicy/policies/scheduled/create_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/scheduled/describe.go b/internal/cli/backup/compliancepolicy/policies/scheduled/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/scheduled/describe.go
rename to internal/cli/backup/compliancepolicy/policies/scheduled/describe.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/scheduled/describe_test.go b/internal/cli/backup/compliancepolicy/policies/scheduled/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/scheduled/describe_test.go
rename to internal/cli/backup/compliancepolicy/policies/scheduled/describe_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/scheduled/scheduled.go b/internal/cli/backup/compliancepolicy/policies/scheduled/scheduled.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/scheduled/scheduled.go
rename to internal/cli/backup/compliancepolicy/policies/scheduled/scheduled.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/policies/scheduled/scheduled_test.go b/internal/cli/backup/compliancepolicy/policies/scheduled/scheduled_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/policies/scheduled/scheduled_test.go
rename to internal/cli/backup/compliancepolicy/policies/scheduled/scheduled_test.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/setup.go b/internal/cli/backup/compliancepolicy/setup.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/setup.go
rename to internal/cli/backup/compliancepolicy/setup.go
diff --git a/internal/cli/atlas/backup/compliancepolicy/setup_test.go b/internal/cli/backup/compliancepolicy/setup_test.go
similarity index 100%
rename from internal/cli/atlas/backup/compliancepolicy/setup_test.go
rename to internal/cli/backup/compliancepolicy/setup_test.go
diff --git a/internal/cli/atlas/backup/exports/buckets/buckets.go b/internal/cli/backup/exports/buckets/buckets.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/buckets.go
rename to internal/cli/backup/exports/buckets/buckets.go
diff --git a/internal/cli/atlas/backup/exports/buckets/buckets_test.go b/internal/cli/backup/exports/buckets/buckets_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/buckets_test.go
rename to internal/cli/backup/exports/buckets/buckets_test.go
diff --git a/internal/cli/atlas/backup/exports/buckets/create.go b/internal/cli/backup/exports/buckets/create.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/create.go
rename to internal/cli/backup/exports/buckets/create.go
diff --git a/internal/cli/atlas/backup/exports/buckets/create_test.go b/internal/cli/backup/exports/buckets/create_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/create_test.go
rename to internal/cli/backup/exports/buckets/create_test.go
diff --git a/internal/cli/atlas/backup/exports/buckets/delete.go b/internal/cli/backup/exports/buckets/delete.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/delete.go
rename to internal/cli/backup/exports/buckets/delete.go
diff --git a/internal/cli/atlas/backup/exports/buckets/delete_test.go b/internal/cli/backup/exports/buckets/delete_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/delete_test.go
rename to internal/cli/backup/exports/buckets/delete_test.go
diff --git a/internal/cli/atlas/backup/exports/buckets/describe.go b/internal/cli/backup/exports/buckets/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/describe.go
rename to internal/cli/backup/exports/buckets/describe.go
diff --git a/internal/cli/atlas/backup/exports/buckets/describe_test.go b/internal/cli/backup/exports/buckets/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/describe_test.go
rename to internal/cli/backup/exports/buckets/describe_test.go
diff --git a/internal/cli/atlas/backup/exports/buckets/list.go b/internal/cli/backup/exports/buckets/list.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/list.go
rename to internal/cli/backup/exports/buckets/list.go
diff --git a/internal/cli/atlas/backup/exports/buckets/list_test.go b/internal/cli/backup/exports/buckets/list_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/buckets/list_test.go
rename to internal/cli/backup/exports/buckets/list_test.go
diff --git a/internal/cli/atlas/backup/exports/exports.go b/internal/cli/backup/exports/exports.go
similarity index 84%
rename from internal/cli/atlas/backup/exports/exports.go
rename to internal/cli/backup/exports/exports.go
index 8bc1ddc367..971358a354 100644
--- a/internal/cli/atlas/backup/exports/exports.go
+++ b/internal/cli/backup/exports/exports.go
@@ -16,8 +16,8 @@ package exports
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/exports/buckets"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/exports/jobs"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/exports/buckets"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/exports/jobs"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/backup/exports/exports_test.go b/internal/cli/backup/exports/exports_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/exports_test.go
rename to internal/cli/backup/exports/exports_test.go
diff --git a/internal/cli/atlas/backup/exports/jobs/create.go b/internal/cli/backup/exports/jobs/create.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/create.go
rename to internal/cli/backup/exports/jobs/create.go
diff --git a/internal/cli/atlas/backup/exports/jobs/create_test.go b/internal/cli/backup/exports/jobs/create_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/create_test.go
rename to internal/cli/backup/exports/jobs/create_test.go
diff --git a/internal/cli/atlas/backup/exports/jobs/describe.go b/internal/cli/backup/exports/jobs/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/describe.go
rename to internal/cli/backup/exports/jobs/describe.go
diff --git a/internal/cli/atlas/backup/exports/jobs/describe_test.go b/internal/cli/backup/exports/jobs/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/describe_test.go
rename to internal/cli/backup/exports/jobs/describe_test.go
diff --git a/internal/cli/atlas/backup/exports/jobs/jobs.go b/internal/cli/backup/exports/jobs/jobs.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/jobs.go
rename to internal/cli/backup/exports/jobs/jobs.go
diff --git a/internal/cli/atlas/backup/exports/jobs/jobs_test.go b/internal/cli/backup/exports/jobs/jobs_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/jobs_test.go
rename to internal/cli/backup/exports/jobs/jobs_test.go
diff --git a/internal/cli/atlas/backup/exports/jobs/list.go b/internal/cli/backup/exports/jobs/list.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/list.go
rename to internal/cli/backup/exports/jobs/list.go
diff --git a/internal/cli/atlas/backup/exports/jobs/list_test.go b/internal/cli/backup/exports/jobs/list_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/list_test.go
rename to internal/cli/backup/exports/jobs/list_test.go
diff --git a/internal/cli/atlas/backup/exports/jobs/watch.go b/internal/cli/backup/exports/jobs/watch.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/watch.go
rename to internal/cli/backup/exports/jobs/watch.go
diff --git a/internal/cli/atlas/backup/exports/jobs/watch_test.go b/internal/cli/backup/exports/jobs/watch_test.go
similarity index 100%
rename from internal/cli/atlas/backup/exports/jobs/watch_test.go
rename to internal/cli/backup/exports/jobs/watch_test.go
diff --git a/internal/cli/atlas/backup/restores/describe.go b/internal/cli/backup/restores/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/describe.go
rename to internal/cli/backup/restores/describe.go
diff --git a/internal/cli/atlas/backup/restores/describe_test.go b/internal/cli/backup/restores/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/describe_test.go
rename to internal/cli/backup/restores/describe_test.go
diff --git a/internal/cli/atlas/backup/restores/list.go b/internal/cli/backup/restores/list.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/list.go
rename to internal/cli/backup/restores/list.go
diff --git a/internal/cli/atlas/backup/restores/list_test.go b/internal/cli/backup/restores/list_test.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/list_test.go
rename to internal/cli/backup/restores/list_test.go
diff --git a/internal/cli/atlas/backup/restores/restores.go b/internal/cli/backup/restores/restores.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/restores.go
rename to internal/cli/backup/restores/restores.go
diff --git a/internal/cli/atlas/backup/restores/restores_test.go b/internal/cli/backup/restores/restores_test.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/restores_test.go
rename to internal/cli/backup/restores/restores_test.go
diff --git a/internal/cli/atlas/backup/restores/start.go b/internal/cli/backup/restores/start.go
similarity index 98%
rename from internal/cli/atlas/backup/restores/start.go
rename to internal/cli/backup/restores/start.go
index 8e119013f7..f7993fbfd9 100644
--- a/internal/cli/atlas/backup/restores/start.go
+++ b/internal/cli/backup/restores/start.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/backup/restores/start_test.go b/internal/cli/backup/restores/start_test.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/start_test.go
rename to internal/cli/backup/restores/start_test.go
diff --git a/internal/cli/atlas/backup/restores/watch.go b/internal/cli/backup/restores/watch.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/watch.go
rename to internal/cli/backup/restores/watch.go
diff --git a/internal/cli/atlas/backup/restores/watch_test.go b/internal/cli/backup/restores/watch_test.go
similarity index 100%
rename from internal/cli/atlas/backup/restores/watch_test.go
rename to internal/cli/backup/restores/watch_test.go
diff --git a/internal/cli/atlas/backup/schedule/delete.go b/internal/cli/backup/schedule/delete.go
similarity index 100%
rename from internal/cli/atlas/backup/schedule/delete.go
rename to internal/cli/backup/schedule/delete.go
diff --git a/internal/cli/atlas/backup/schedule/delete_test.go b/internal/cli/backup/schedule/delete_test.go
similarity index 100%
rename from internal/cli/atlas/backup/schedule/delete_test.go
rename to internal/cli/backup/schedule/delete_test.go
diff --git a/internal/cli/atlas/backup/schedule/describe.go b/internal/cli/backup/schedule/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/schedule/describe.go
rename to internal/cli/backup/schedule/describe.go
diff --git a/internal/cli/atlas/backup/schedule/describe_test.go b/internal/cli/backup/schedule/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/schedule/describe_test.go
rename to internal/cli/backup/schedule/describe_test.go
diff --git a/internal/cli/atlas/backup/schedule/schedule.go b/internal/cli/backup/schedule/schedule.go
similarity index 100%
rename from internal/cli/atlas/backup/schedule/schedule.go
rename to internal/cli/backup/schedule/schedule.go
diff --git a/internal/cli/atlas/backup/schedule/schedule_test.go b/internal/cli/backup/schedule/schedule_test.go
similarity index 100%
rename from internal/cli/atlas/backup/schedule/schedule_test.go
rename to internal/cli/backup/schedule/schedule_test.go
diff --git a/internal/cli/atlas/backup/schedule/update.go b/internal/cli/backup/schedule/update.go
similarity index 100%
rename from internal/cli/atlas/backup/schedule/update.go
rename to internal/cli/backup/schedule/update.go
diff --git a/internal/cli/atlas/backup/schedule/update_test.go b/internal/cli/backup/schedule/update_test.go
similarity index 100%
rename from internal/cli/atlas/backup/schedule/update_test.go
rename to internal/cli/backup/schedule/update_test.go
diff --git a/internal/cli/atlas/backup/snapshots/create.go b/internal/cli/backup/snapshots/create.go
similarity index 97%
rename from internal/cli/atlas/backup/snapshots/create.go
rename to internal/cli/backup/snapshots/create.go
index 36129cc89c..a783c7ace2 100644
--- a/internal/cli/atlas/backup/snapshots/create.go
+++ b/internal/cli/backup/snapshots/create.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/backup/snapshots/create_test.go b/internal/cli/backup/snapshots/create_test.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/create_test.go
rename to internal/cli/backup/snapshots/create_test.go
diff --git a/internal/cli/atlas/backup/snapshots/delete.go b/internal/cli/backup/snapshots/delete.go
similarity index 97%
rename from internal/cli/atlas/backup/snapshots/delete.go
rename to internal/cli/backup/snapshots/delete.go
index 35e81c0397..acef67bbd7 100644
--- a/internal/cli/atlas/backup/snapshots/delete.go
+++ b/internal/cli/backup/snapshots/delete.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/backup/snapshots/delete_test.go b/internal/cli/backup/snapshots/delete_test.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/delete_test.go
rename to internal/cli/backup/snapshots/delete_test.go
diff --git a/internal/cli/atlas/backup/snapshots/describe.go b/internal/cli/backup/snapshots/describe.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/describe.go
rename to internal/cli/backup/snapshots/describe.go
diff --git a/internal/cli/atlas/backup/snapshots/describe_test.go b/internal/cli/backup/snapshots/describe_test.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/describe_test.go
rename to internal/cli/backup/snapshots/describe_test.go
diff --git a/internal/cli/atlas/backup/snapshots/list.go b/internal/cli/backup/snapshots/list.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/list.go
rename to internal/cli/backup/snapshots/list.go
diff --git a/internal/cli/atlas/backup/snapshots/list_test.go b/internal/cli/backup/snapshots/list_test.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/list_test.go
rename to internal/cli/backup/snapshots/list_test.go
diff --git a/internal/cli/atlas/backup/snapshots/snapshots.go b/internal/cli/backup/snapshots/snapshots.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/snapshots.go
rename to internal/cli/backup/snapshots/snapshots.go
diff --git a/internal/cli/atlas/backup/snapshots/snapshots_test.go b/internal/cli/backup/snapshots/snapshots_test.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/snapshots_test.go
rename to internal/cli/backup/snapshots/snapshots_test.go
diff --git a/internal/cli/atlas/backup/snapshots/watch.go b/internal/cli/backup/snapshots/watch.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/watch.go
rename to internal/cli/backup/snapshots/watch.go
diff --git a/internal/cli/atlas/backup/snapshots/watch_test.go b/internal/cli/backup/snapshots/watch_test.go
similarity index 100%
rename from internal/cli/atlas/backup/snapshots/watch_test.go
rename to internal/cli/backup/snapshots/watch_test.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/access_roles.go b/internal/cli/cloudproviders/accessroles/access_roles.go
similarity index 90%
rename from internal/cli/atlas/cloudproviders/accessroles/access_roles.go
rename to internal/cli/cloudproviders/accessroles/access_roles.go
index 10acb7560d..2e027d51bf 100644
--- a/internal/cli/atlas/cloudproviders/accessroles/access_roles.go
+++ b/internal/cli/cloudproviders/accessroles/access_roles.go
@@ -16,7 +16,7 @@ package accessroles
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/cloudproviders/accessroles/aws"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/cloudproviders/accessroles/aws"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/cloudproviders/accessroles/access_roles_test.go b/internal/cli/cloudproviders/accessroles/access_roles_test.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/access_roles_test.go
rename to internal/cli/cloudproviders/accessroles/access_roles_test.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/aws/authorize.go b/internal/cli/cloudproviders/accessroles/aws/authorize.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/aws/authorize.go
rename to internal/cli/cloudproviders/accessroles/aws/authorize.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/aws/authorize_test.go b/internal/cli/cloudproviders/accessroles/aws/authorize_test.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/aws/authorize_test.go
rename to internal/cli/cloudproviders/accessroles/aws/authorize_test.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/aws/aws.go b/internal/cli/cloudproviders/accessroles/aws/aws.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/aws/aws.go
rename to internal/cli/cloudproviders/accessroles/aws/aws.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/aws/aws_test.go b/internal/cli/cloudproviders/accessroles/aws/aws_test.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/aws/aws_test.go
rename to internal/cli/cloudproviders/accessroles/aws/aws_test.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/aws/create.go b/internal/cli/cloudproviders/accessroles/aws/create.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/aws/create.go
rename to internal/cli/cloudproviders/accessroles/aws/create.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/aws/create_test.go b/internal/cli/cloudproviders/accessroles/aws/create_test.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/aws/create_test.go
rename to internal/cli/cloudproviders/accessroles/aws/create_test.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/aws/deauthorize.go b/internal/cli/cloudproviders/accessroles/aws/deauthorize.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/aws/deauthorize.go
rename to internal/cli/cloudproviders/accessroles/aws/deauthorize.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/aws/deauthorize_test.go b/internal/cli/cloudproviders/accessroles/aws/deauthorize_test.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/aws/deauthorize_test.go
rename to internal/cli/cloudproviders/accessroles/aws/deauthorize_test.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/list.go b/internal/cli/cloudproviders/accessroles/list.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/list.go
rename to internal/cli/cloudproviders/accessroles/list.go
diff --git a/internal/cli/atlas/cloudproviders/accessroles/list_test.go b/internal/cli/cloudproviders/accessroles/list_test.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/accessroles/list_test.go
rename to internal/cli/cloudproviders/accessroles/list_test.go
diff --git a/internal/cli/atlas/cloudproviders/cloud_providers.go b/internal/cli/cloudproviders/cloud_providers.go
similarity index 91%
rename from internal/cli/atlas/cloudproviders/cloud_providers.go
rename to internal/cli/cloudproviders/cloud_providers.go
index d420c78747..9d167fb081 100644
--- a/internal/cli/atlas/cloudproviders/cloud_providers.go
+++ b/internal/cli/cloudproviders/cloud_providers.go
@@ -16,7 +16,7 @@ package cloudproviders
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/cloudproviders/accessroles"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/cloudproviders/accessroles"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/cloudproviders/cloud_providers_test.go b/internal/cli/cloudproviders/cloud_providers_test.go
similarity index 100%
rename from internal/cli/atlas/cloudproviders/cloud_providers_test.go
rename to internal/cli/cloudproviders/cloud_providers_test.go
diff --git a/internal/cli/atlas/clusters/advancedsettings/advanced_settings.go b/internal/cli/clusters/advancedsettings/advanced_settings.go
similarity index 100%
rename from internal/cli/atlas/clusters/advancedsettings/advanced_settings.go
rename to internal/cli/clusters/advancedsettings/advanced_settings.go
diff --git a/internal/cli/atlas/clusters/advancedsettings/advanced_settings_test.go b/internal/cli/clusters/advancedsettings/advanced_settings_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/advancedsettings/advanced_settings_test.go
rename to internal/cli/clusters/advancedsettings/advanced_settings_test.go
diff --git a/internal/cli/atlas/clusters/advancedsettings/describe.go b/internal/cli/clusters/advancedsettings/describe.go
similarity index 100%
rename from internal/cli/atlas/clusters/advancedsettings/describe.go
rename to internal/cli/clusters/advancedsettings/describe.go
diff --git a/internal/cli/atlas/clusters/advancedsettings/describe_test.go b/internal/cli/clusters/advancedsettings/describe_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/advancedsettings/describe_test.go
rename to internal/cli/clusters/advancedsettings/describe_test.go
diff --git a/internal/cli/atlas/clusters/advancedsettings/update.go b/internal/cli/clusters/advancedsettings/update.go
similarity index 98%
rename from internal/cli/atlas/clusters/advancedsettings/update.go
rename to internal/cli/clusters/advancedsettings/update.go
index 27024c2b3a..b7b11aa574 100644
--- a/internal/cli/atlas/clusters/advancedsettings/update.go
+++ b/internal/cli/clusters/advancedsettings/update.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/clusters/advancedsettings/update_test.go b/internal/cli/clusters/advancedsettings/update_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/advancedsettings/update_test.go
rename to internal/cli/clusters/advancedsettings/update_test.go
diff --git a/internal/cli/atlas/clusters/availableregions/available_regions.go b/internal/cli/clusters/availableregions/available_regions.go
similarity index 100%
rename from internal/cli/atlas/clusters/availableregions/available_regions.go
rename to internal/cli/clusters/availableregions/available_regions.go
diff --git a/internal/cli/atlas/clusters/availableregions/available_regions_test.go b/internal/cli/clusters/availableregions/available_regions_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/availableregions/available_regions_test.go
rename to internal/cli/clusters/availableregions/available_regions_test.go
diff --git a/internal/cli/atlas/clusters/availableregions/list.go b/internal/cli/clusters/availableregions/list.go
similarity index 100%
rename from internal/cli/atlas/clusters/availableregions/list.go
rename to internal/cli/clusters/availableregions/list.go
diff --git a/internal/cli/atlas/clusters/availableregions/list_test.go b/internal/cli/clusters/availableregions/list_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/availableregions/list_test.go
rename to internal/cli/clusters/availableregions/list_test.go
diff --git a/internal/cli/atlas/clusters/clusters.go b/internal/cli/clusters/clusters.go
similarity index 82%
rename from internal/cli/atlas/clusters/clusters.go
rename to internal/cli/clusters/clusters.go
index bbbe1ccc45..5fb1574d57 100644
--- a/internal/cli/atlas/clusters/clusters.go
+++ b/internal/cli/clusters/clusters.go
@@ -16,13 +16,13 @@ package clusters
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/advancedsettings"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/availableregions"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/connectionstring"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/indexes"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/onlinearchive"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/sampledata"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/advancedsettings"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/availableregions"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/connectionstring"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/indexes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/onlinearchive"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/sampledata"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search"
 	"github.com/spf13/cobra"
 	atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin"
 	atlas "go.mongodb.org/atlas/mongodbatlas"
diff --git a/internal/cli/atlas/clusters/clusters_test.go b/internal/cli/clusters/clusters_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/clusters_test.go
rename to internal/cli/clusters/clusters_test.go
diff --git a/internal/cli/atlas/clusters/connectionstring/connection_string.go b/internal/cli/clusters/connectionstring/connection_string.go
similarity index 100%
rename from internal/cli/atlas/clusters/connectionstring/connection_string.go
rename to internal/cli/clusters/connectionstring/connection_string.go
diff --git a/internal/cli/atlas/clusters/connectionstring/connection_string_test.go b/internal/cli/clusters/connectionstring/connection_string_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/connectionstring/connection_string_test.go
rename to internal/cli/clusters/connectionstring/connection_string_test.go
diff --git a/internal/cli/atlas/clusters/connectionstring/describe.go b/internal/cli/clusters/connectionstring/describe.go
similarity index 100%
rename from internal/cli/atlas/clusters/connectionstring/describe.go
rename to internal/cli/clusters/connectionstring/describe.go
diff --git a/internal/cli/atlas/clusters/connectionstring/describe_test.go b/internal/cli/clusters/connectionstring/describe_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/connectionstring/describe_test.go
rename to internal/cli/clusters/connectionstring/describe_test.go
diff --git a/internal/cli/atlas/clusters/create.go b/internal/cli/clusters/create.go
similarity index 100%
rename from internal/cli/atlas/clusters/create.go
rename to internal/cli/clusters/create.go
diff --git a/internal/cli/atlas/clusters/create_test.go b/internal/cli/clusters/create_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/create_test.go
rename to internal/cli/clusters/create_test.go
diff --git a/internal/cli/atlas/clusters/delete.go b/internal/cli/clusters/delete.go
similarity index 100%
rename from internal/cli/atlas/clusters/delete.go
rename to internal/cli/clusters/delete.go
diff --git a/internal/cli/atlas/clusters/delete_test.go b/internal/cli/clusters/delete_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/delete_test.go
rename to internal/cli/clusters/delete_test.go
diff --git a/internal/cli/atlas/clusters/describe.go b/internal/cli/clusters/describe.go
similarity index 100%
rename from internal/cli/atlas/clusters/describe.go
rename to internal/cli/clusters/describe.go
diff --git a/internal/cli/atlas/clusters/describe_test.go b/internal/cli/clusters/describe_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/describe_test.go
rename to internal/cli/clusters/describe_test.go
diff --git a/internal/cli/atlas/clusters/failover.go b/internal/cli/clusters/failover.go
similarity index 100%
rename from internal/cli/atlas/clusters/failover.go
rename to internal/cli/clusters/failover.go
diff --git a/internal/cli/atlas/clusters/failover_test.go b/internal/cli/clusters/failover_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/failover_test.go
rename to internal/cli/clusters/failover_test.go
diff --git a/internal/cli/atlas/clusters/indexes/create.go b/internal/cli/clusters/indexes/create.go
similarity index 100%
rename from internal/cli/atlas/clusters/indexes/create.go
rename to internal/cli/clusters/indexes/create.go
diff --git a/internal/cli/atlas/clusters/indexes/create_test.go b/internal/cli/clusters/indexes/create_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/indexes/create_test.go
rename to internal/cli/clusters/indexes/create_test.go
diff --git a/internal/cli/atlas/clusters/indexes/indexes.go b/internal/cli/clusters/indexes/indexes.go
similarity index 100%
rename from internal/cli/atlas/clusters/indexes/indexes.go
rename to internal/cli/clusters/indexes/indexes.go
diff --git a/internal/cli/atlas/clusters/indexes/indexes_test.go b/internal/cli/clusters/indexes/indexes_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/indexes/indexes_test.go
rename to internal/cli/clusters/indexes/indexes_test.go
diff --git a/internal/cli/atlas/clusters/list.go b/internal/cli/clusters/list.go
similarity index 100%
rename from internal/cli/atlas/clusters/list.go
rename to internal/cli/clusters/list.go
diff --git a/internal/cli/atlas/clusters/list_test.go b/internal/cli/clusters/list_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/list_test.go
rename to internal/cli/clusters/list_test.go
diff --git a/internal/cli/atlas/clusters/load_sample_data.go b/internal/cli/clusters/load_sample_data.go
similarity index 100%
rename from internal/cli/atlas/clusters/load_sample_data.go
rename to internal/cli/clusters/load_sample_data.go
diff --git a/internal/cli/atlas/clusters/load_sample_data_test.go b/internal/cli/clusters/load_sample_data_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/load_sample_data_test.go
rename to internal/cli/clusters/load_sample_data_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/create.go b/internal/cli/clusters/onlinearchive/create.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/create.go
rename to internal/cli/clusters/onlinearchive/create.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/create_test.go b/internal/cli/clusters/onlinearchive/create_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/create_test.go
rename to internal/cli/clusters/onlinearchive/create_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/delete.go b/internal/cli/clusters/onlinearchive/delete.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/delete.go
rename to internal/cli/clusters/onlinearchive/delete.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/delete_test.go b/internal/cli/clusters/onlinearchive/delete_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/delete_test.go
rename to internal/cli/clusters/onlinearchive/delete_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/describe.go b/internal/cli/clusters/onlinearchive/describe.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/describe.go
rename to internal/cli/clusters/onlinearchive/describe.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/describe_test.go b/internal/cli/clusters/onlinearchive/describe_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/describe_test.go
rename to internal/cli/clusters/onlinearchive/describe_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/list.go b/internal/cli/clusters/onlinearchive/list.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/list.go
rename to internal/cli/clusters/onlinearchive/list.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/list_test.go b/internal/cli/clusters/onlinearchive/list_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/list_test.go
rename to internal/cli/clusters/onlinearchive/list_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/online_archive.go b/internal/cli/clusters/onlinearchive/online_archive.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/online_archive.go
rename to internal/cli/clusters/onlinearchive/online_archive.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/online_archive_test.go b/internal/cli/clusters/onlinearchive/online_archive_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/online_archive_test.go
rename to internal/cli/clusters/onlinearchive/online_archive_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/pause.go b/internal/cli/clusters/onlinearchive/pause.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/pause.go
rename to internal/cli/clusters/onlinearchive/pause.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/pause_test.go b/internal/cli/clusters/onlinearchive/pause_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/pause_test.go
rename to internal/cli/clusters/onlinearchive/pause_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/start.go b/internal/cli/clusters/onlinearchive/start.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/start.go
rename to internal/cli/clusters/onlinearchive/start.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/start_test.go b/internal/cli/clusters/onlinearchive/start_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/start_test.go
rename to internal/cli/clusters/onlinearchive/start_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/update.go b/internal/cli/clusters/onlinearchive/update.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/update.go
rename to internal/cli/clusters/onlinearchive/update.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/update_test.go b/internal/cli/clusters/onlinearchive/update_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/update_test.go
rename to internal/cli/clusters/onlinearchive/update_test.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/watch.go b/internal/cli/clusters/onlinearchive/watch.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/watch.go
rename to internal/cli/clusters/onlinearchive/watch.go
diff --git a/internal/cli/atlas/clusters/onlinearchive/watch_test.go b/internal/cli/clusters/onlinearchive/watch_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/onlinearchive/watch_test.go
rename to internal/cli/clusters/onlinearchive/watch_test.go
diff --git a/internal/cli/atlas/clusters/pause.go b/internal/cli/clusters/pause.go
similarity index 97%
rename from internal/cli/atlas/clusters/pause.go
rename to internal/cli/clusters/pause.go
index 8cc7efd562..e59ef0d0ed 100644
--- a/internal/cli/atlas/clusters/pause.go
+++ b/internal/cli/clusters/pause.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/clusters/pause_test.go b/internal/cli/clusters/pause_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/pause_test.go
rename to internal/cli/clusters/pause_test.go
diff --git a/internal/cli/atlas/clusters/region_tier_autocomplete.go b/internal/cli/clusters/region_tier_autocomplete.go
similarity index 100%
rename from internal/cli/atlas/clusters/region_tier_autocomplete.go
rename to internal/cli/clusters/region_tier_autocomplete.go
diff --git a/internal/cli/atlas/clusters/region_tier_autocomplete_test.go b/internal/cli/clusters/region_tier_autocomplete_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/region_tier_autocomplete_test.go
rename to internal/cli/clusters/region_tier_autocomplete_test.go
diff --git a/internal/cli/atlas/clusters/sampledata/describe.go b/internal/cli/clusters/sampledata/describe.go
similarity index 100%
rename from internal/cli/atlas/clusters/sampledata/describe.go
rename to internal/cli/clusters/sampledata/describe.go
diff --git a/internal/cli/atlas/clusters/sampledata/describe_test.go b/internal/cli/clusters/sampledata/describe_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/sampledata/describe_test.go
rename to internal/cli/clusters/sampledata/describe_test.go
diff --git a/internal/cli/atlas/clusters/sampledata/load.go b/internal/cli/clusters/sampledata/load.go
similarity index 100%
rename from internal/cli/atlas/clusters/sampledata/load.go
rename to internal/cli/clusters/sampledata/load.go
diff --git a/internal/cli/atlas/clusters/sampledata/load_test.go b/internal/cli/clusters/sampledata/load_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/sampledata/load_test.go
rename to internal/cli/clusters/sampledata/load_test.go
diff --git a/internal/cli/atlas/clusters/sampledata/sample_data.go b/internal/cli/clusters/sampledata/sample_data.go
similarity index 100%
rename from internal/cli/atlas/clusters/sampledata/sample_data.go
rename to internal/cli/clusters/sampledata/sample_data.go
diff --git a/internal/cli/atlas/clusters/sampledata/sample_data_test.go b/internal/cli/clusters/sampledata/sample_data_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/sampledata/sample_data_test.go
rename to internal/cli/clusters/sampledata/sample_data_test.go
diff --git a/internal/cli/atlas/clusters/sampledata/watch.go b/internal/cli/clusters/sampledata/watch.go
similarity index 100%
rename from internal/cli/atlas/clusters/sampledata/watch.go
rename to internal/cli/clusters/sampledata/watch.go
diff --git a/internal/cli/atlas/clusters/sampledata/watch_test.go b/internal/cli/clusters/sampledata/watch_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/sampledata/watch_test.go
rename to internal/cli/clusters/sampledata/watch_test.go
diff --git a/internal/cli/atlas/clusters/start.go b/internal/cli/clusters/start.go
similarity index 97%
rename from internal/cli/atlas/clusters/start.go
rename to internal/cli/clusters/start.go
index 9d52388b14..2518818ae7 100644
--- a/internal/cli/atlas/clusters/start.go
+++ b/internal/cli/clusters/start.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/clusters/start_test.go b/internal/cli/clusters/start_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/start_test.go
rename to internal/cli/clusters/start_test.go
diff --git a/internal/cli/atlas/clusters/update.go b/internal/cli/clusters/update.go
similarity index 99%
rename from internal/cli/atlas/clusters/update.go
rename to internal/cli/clusters/update.go
index 0907a84c5a..287c6259fd 100644
--- a/internal/cli/atlas/clusters/update.go
+++ b/internal/cli/clusters/update.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/file"
diff --git a/internal/cli/atlas/clusters/update_test.go b/internal/cli/clusters/update_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/update_test.go
rename to internal/cli/clusters/update_test.go
diff --git a/internal/cli/atlas/clusters/upgrade.go b/internal/cli/clusters/upgrade.go
similarity index 100%
rename from internal/cli/atlas/clusters/upgrade.go
rename to internal/cli/clusters/upgrade.go
diff --git a/internal/cli/atlas/clusters/upgrade_test.go b/internal/cli/clusters/upgrade_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/upgrade_test.go
rename to internal/cli/clusters/upgrade_test.go
diff --git a/internal/cli/atlas/clusters/watch.go b/internal/cli/clusters/watch.go
similarity index 100%
rename from internal/cli/atlas/clusters/watch.go
rename to internal/cli/clusters/watch.go
diff --git a/internal/cli/atlas/clusters/watch_test.go b/internal/cli/clusters/watch_test.go
similarity index 100%
rename from internal/cli/atlas/clusters/watch_test.go
rename to internal/cli/clusters/watch_test.go
diff --git a/internal/cli/atlas/commonerrors/errors.go b/internal/cli/commonerrors/errors.go
similarity index 100%
rename from internal/cli/atlas/commonerrors/errors.go
rename to internal/cli/commonerrors/errors.go
diff --git a/internal/cli/atlas/commonerrors/errors_test.go b/internal/cli/commonerrors/errors_test.go
similarity index 100%
rename from internal/cli/atlas/commonerrors/errors_test.go
rename to internal/cli/commonerrors/errors_test.go
diff --git a/internal/cli/atlas/customdbroles/create.go b/internal/cli/customdbroles/create.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/create.go
rename to internal/cli/customdbroles/create.go
diff --git a/internal/cli/atlas/customdbroles/create_test.go b/internal/cli/customdbroles/create_test.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/create_test.go
rename to internal/cli/customdbroles/create_test.go
diff --git a/internal/cli/atlas/customdbroles/custom_db_roles.go b/internal/cli/customdbroles/custom_db_roles.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/custom_db_roles.go
rename to internal/cli/customdbroles/custom_db_roles.go
diff --git a/internal/cli/atlas/customdbroles/custom_db_roles_test.go b/internal/cli/customdbroles/custom_db_roles_test.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/custom_db_roles_test.go
rename to internal/cli/customdbroles/custom_db_roles_test.go
diff --git a/internal/cli/atlas/customdbroles/delete.go b/internal/cli/customdbroles/delete.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/delete.go
rename to internal/cli/customdbroles/delete.go
diff --git a/internal/cli/atlas/customdbroles/delete_test.go b/internal/cli/customdbroles/delete_test.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/delete_test.go
rename to internal/cli/customdbroles/delete_test.go
diff --git a/internal/cli/atlas/customdbroles/describe.go b/internal/cli/customdbroles/describe.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/describe.go
rename to internal/cli/customdbroles/describe.go
diff --git a/internal/cli/atlas/customdbroles/describe_test.go b/internal/cli/customdbroles/describe_test.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/describe_test.go
rename to internal/cli/customdbroles/describe_test.go
diff --git a/internal/cli/atlas/customdbroles/list.go b/internal/cli/customdbroles/list.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/list.go
rename to internal/cli/customdbroles/list.go
diff --git a/internal/cli/atlas/customdbroles/list_test.go b/internal/cli/customdbroles/list_test.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/list_test.go
rename to internal/cli/customdbroles/list_test.go
diff --git a/internal/cli/atlas/customdbroles/update.go b/internal/cli/customdbroles/update.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/update.go
rename to internal/cli/customdbroles/update.go
diff --git a/internal/cli/atlas/customdbroles/update_test.go b/internal/cli/customdbroles/update_test.go
similarity index 100%
rename from internal/cli/atlas/customdbroles/update_test.go
rename to internal/cli/customdbroles/update_test.go
diff --git a/internal/cli/atlas/customdns/aws/aws.go b/internal/cli/customdns/aws/aws.go
similarity index 100%
rename from internal/cli/atlas/customdns/aws/aws.go
rename to internal/cli/customdns/aws/aws.go
diff --git a/internal/cli/atlas/customdns/aws/aws_test.go b/internal/cli/customdns/aws/aws_test.go
similarity index 100%
rename from internal/cli/atlas/customdns/aws/aws_test.go
rename to internal/cli/customdns/aws/aws_test.go
diff --git a/internal/cli/atlas/customdns/aws/describe.go b/internal/cli/customdns/aws/describe.go
similarity index 100%
rename from internal/cli/atlas/customdns/aws/describe.go
rename to internal/cli/customdns/aws/describe.go
diff --git a/internal/cli/atlas/customdns/aws/describe_test.go b/internal/cli/customdns/aws/describe_test.go
similarity index 100%
rename from internal/cli/atlas/customdns/aws/describe_test.go
rename to internal/cli/customdns/aws/describe_test.go
diff --git a/internal/cli/atlas/customdns/aws/disable.go b/internal/cli/customdns/aws/disable.go
similarity index 100%
rename from internal/cli/atlas/customdns/aws/disable.go
rename to internal/cli/customdns/aws/disable.go
diff --git a/internal/cli/atlas/customdns/aws/disable_test.go b/internal/cli/customdns/aws/disable_test.go
similarity index 100%
rename from internal/cli/atlas/customdns/aws/disable_test.go
rename to internal/cli/customdns/aws/disable_test.go
diff --git a/internal/cli/atlas/customdns/aws/enable.go b/internal/cli/customdns/aws/enable.go
similarity index 100%
rename from internal/cli/atlas/customdns/aws/enable.go
rename to internal/cli/customdns/aws/enable.go
diff --git a/internal/cli/atlas/customdns/aws/enable_test.go b/internal/cli/customdns/aws/enable_test.go
similarity index 100%
rename from internal/cli/atlas/customdns/aws/enable_test.go
rename to internal/cli/customdns/aws/enable_test.go
diff --git a/internal/cli/atlas/customdns/custom_dns.go b/internal/cli/customdns/custom_dns.go
similarity index 92%
rename from internal/cli/atlas/customdns/custom_dns.go
rename to internal/cli/customdns/custom_dns.go
index cea95b77c1..1397e759cc 100644
--- a/internal/cli/atlas/customdns/custom_dns.go
+++ b/internal/cli/customdns/custom_dns.go
@@ -16,7 +16,7 @@ package customdns
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/customdns/aws"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/customdns/aws"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/customdns/custom_dns_test.go b/internal/cli/customdns/custom_dns_test.go
similarity index 100%
rename from internal/cli/atlas/customdns/custom_dns_test.go
rename to internal/cli/customdns/custom_dns_test.go
diff --git a/internal/cli/atlas/datafederation/create.go b/internal/cli/datafederation/create.go
similarity index 100%
rename from internal/cli/atlas/datafederation/create.go
rename to internal/cli/datafederation/create.go
diff --git a/internal/cli/atlas/datafederation/create_test.go b/internal/cli/datafederation/create_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/create_test.go
rename to internal/cli/datafederation/create_test.go
diff --git a/internal/cli/atlas/datafederation/data_federation.go b/internal/cli/datafederation/data_federation.go
similarity index 86%
rename from internal/cli/atlas/datafederation/data_federation.go
rename to internal/cli/datafederation/data_federation.go
index cc7ebbec6e..636aadb9ec 100644
--- a/internal/cli/atlas/datafederation/data_federation.go
+++ b/internal/cli/datafederation/data_federation.go
@@ -18,8 +18,8 @@ package datafederation
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datafederation/privateendpoints"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datafederation/querylimits"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datafederation/privateendpoints"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datafederation/querylimits"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/datafederation/data_federation_test.go b/internal/cli/datafederation/data_federation_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/data_federation_test.go
rename to internal/cli/datafederation/data_federation_test.go
diff --git a/internal/cli/atlas/datafederation/delete.go b/internal/cli/datafederation/delete.go
similarity index 100%
rename from internal/cli/atlas/datafederation/delete.go
rename to internal/cli/datafederation/delete.go
diff --git a/internal/cli/atlas/datafederation/delete_test.go b/internal/cli/datafederation/delete_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/delete_test.go
rename to internal/cli/datafederation/delete_test.go
diff --git a/internal/cli/atlas/datafederation/describe.go b/internal/cli/datafederation/describe.go
similarity index 100%
rename from internal/cli/atlas/datafederation/describe.go
rename to internal/cli/datafederation/describe.go
diff --git a/internal/cli/atlas/datafederation/describe_test.go b/internal/cli/datafederation/describe_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/describe_test.go
rename to internal/cli/datafederation/describe_test.go
diff --git a/internal/cli/atlas/datafederation/list.go b/internal/cli/datafederation/list.go
similarity index 100%
rename from internal/cli/atlas/datafederation/list.go
rename to internal/cli/datafederation/list.go
diff --git a/internal/cli/atlas/datafederation/list_test.go b/internal/cli/datafederation/list_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/list_test.go
rename to internal/cli/datafederation/list_test.go
diff --git a/internal/cli/atlas/datafederation/logs.go b/internal/cli/datafederation/logs.go
similarity index 100%
rename from internal/cli/atlas/datafederation/logs.go
rename to internal/cli/datafederation/logs.go
diff --git a/internal/cli/atlas/datafederation/logs_test.go b/internal/cli/datafederation/logs_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/logs_test.go
rename to internal/cli/datafederation/logs_test.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/create.go b/internal/cli/datafederation/privateendpoints/create.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/create.go
rename to internal/cli/datafederation/privateendpoints/create.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/create_test.go b/internal/cli/datafederation/privateendpoints/create_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/create_test.go
rename to internal/cli/datafederation/privateendpoints/create_test.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/delete.go b/internal/cli/datafederation/privateendpoints/delete.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/delete.go
rename to internal/cli/datafederation/privateendpoints/delete.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/delete_test.go b/internal/cli/datafederation/privateendpoints/delete_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/delete_test.go
rename to internal/cli/datafederation/privateendpoints/delete_test.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/describe.go b/internal/cli/datafederation/privateendpoints/describe.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/describe.go
rename to internal/cli/datafederation/privateendpoints/describe.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/describe_test.go b/internal/cli/datafederation/privateendpoints/describe_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/describe_test.go
rename to internal/cli/datafederation/privateendpoints/describe_test.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/list.go b/internal/cli/datafederation/privateendpoints/list.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/list.go
rename to internal/cli/datafederation/privateendpoints/list.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/list_test.go b/internal/cli/datafederation/privateendpoints/list_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/list_test.go
rename to internal/cli/datafederation/privateendpoints/list_test.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/private_endpoints.go b/internal/cli/datafederation/privateendpoints/private_endpoints.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/private_endpoints.go
rename to internal/cli/datafederation/privateendpoints/private_endpoints.go
diff --git a/internal/cli/atlas/datafederation/privateendpoints/private_endpoints_test.go b/internal/cli/datafederation/privateendpoints/private_endpoints_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/privateendpoints/private_endpoints_test.go
rename to internal/cli/datafederation/privateendpoints/private_endpoints_test.go
diff --git a/internal/cli/atlas/datafederation/querylimits/create.go b/internal/cli/datafederation/querylimits/create.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/create.go
rename to internal/cli/datafederation/querylimits/create.go
diff --git a/internal/cli/atlas/datafederation/querylimits/create_test.go b/internal/cli/datafederation/querylimits/create_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/create_test.go
rename to internal/cli/datafederation/querylimits/create_test.go
diff --git a/internal/cli/atlas/datafederation/querylimits/delete.go b/internal/cli/datafederation/querylimits/delete.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/delete.go
rename to internal/cli/datafederation/querylimits/delete.go
diff --git a/internal/cli/atlas/datafederation/querylimits/delete_test.go b/internal/cli/datafederation/querylimits/delete_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/delete_test.go
rename to internal/cli/datafederation/querylimits/delete_test.go
diff --git a/internal/cli/atlas/datafederation/querylimits/describe.go b/internal/cli/datafederation/querylimits/describe.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/describe.go
rename to internal/cli/datafederation/querylimits/describe.go
diff --git a/internal/cli/atlas/datafederation/querylimits/describe_test.go b/internal/cli/datafederation/querylimits/describe_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/describe_test.go
rename to internal/cli/datafederation/querylimits/describe_test.go
diff --git a/internal/cli/atlas/datafederation/querylimits/list.go b/internal/cli/datafederation/querylimits/list.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/list.go
rename to internal/cli/datafederation/querylimits/list.go
diff --git a/internal/cli/atlas/datafederation/querylimits/list_test.go b/internal/cli/datafederation/querylimits/list_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/list_test.go
rename to internal/cli/datafederation/querylimits/list_test.go
diff --git a/internal/cli/atlas/datafederation/querylimits/query_limits.go b/internal/cli/datafederation/querylimits/query_limits.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/query_limits.go
rename to internal/cli/datafederation/querylimits/query_limits.go
diff --git a/internal/cli/atlas/datafederation/querylimits/query_limits_test.go b/internal/cli/datafederation/querylimits/query_limits_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/querylimits/query_limits_test.go
rename to internal/cli/datafederation/querylimits/query_limits_test.go
diff --git a/internal/cli/atlas/datafederation/update.go b/internal/cli/datafederation/update.go
similarity index 100%
rename from internal/cli/atlas/datafederation/update.go
rename to internal/cli/datafederation/update.go
diff --git a/internal/cli/atlas/datafederation/update_test.go b/internal/cli/datafederation/update_test.go
similarity index 100%
rename from internal/cli/atlas/datafederation/update_test.go
rename to internal/cli/datafederation/update_test.go
diff --git a/internal/cli/atlas/datalake/create.go b/internal/cli/datalake/create.go
similarity index 100%
rename from internal/cli/atlas/datalake/create.go
rename to internal/cli/datalake/create.go
diff --git a/internal/cli/atlas/datalake/create_test.go b/internal/cli/datalake/create_test.go
similarity index 100%
rename from internal/cli/atlas/datalake/create_test.go
rename to internal/cli/datalake/create_test.go
diff --git a/internal/cli/atlas/datalake/data_lake.go b/internal/cli/datalake/data_lake.go
similarity index 100%
rename from internal/cli/atlas/datalake/data_lake.go
rename to internal/cli/datalake/data_lake.go
diff --git a/internal/cli/atlas/datalake/delete.go b/internal/cli/datalake/delete.go
similarity index 100%
rename from internal/cli/atlas/datalake/delete.go
rename to internal/cli/datalake/delete.go
diff --git a/internal/cli/atlas/datalake/delete_test.go b/internal/cli/datalake/delete_test.go
similarity index 100%
rename from internal/cli/atlas/datalake/delete_test.go
rename to internal/cli/datalake/delete_test.go
diff --git a/internal/cli/atlas/datalake/describe.go b/internal/cli/datalake/describe.go
similarity index 100%
rename from internal/cli/atlas/datalake/describe.go
rename to internal/cli/datalake/describe.go
diff --git a/internal/cli/atlas/datalake/describe_test.go b/internal/cli/datalake/describe_test.go
similarity index 100%
rename from internal/cli/atlas/datalake/describe_test.go
rename to internal/cli/datalake/describe_test.go
diff --git a/internal/cli/atlas/datalake/list.go b/internal/cli/datalake/list.go
similarity index 100%
rename from internal/cli/atlas/datalake/list.go
rename to internal/cli/datalake/list.go
diff --git a/internal/cli/atlas/datalake/list_test.go b/internal/cli/datalake/list_test.go
similarity index 100%
rename from internal/cli/atlas/datalake/list_test.go
rename to internal/cli/datalake/list_test.go
diff --git a/internal/cli/atlas/datalake/update.go b/internal/cli/datalake/update.go
similarity index 100%
rename from internal/cli/atlas/datalake/update.go
rename to internal/cli/datalake/update.go
diff --git a/internal/cli/atlas/datalake/update_test.go b/internal/cli/datalake/update_test.go
similarity index 100%
rename from internal/cli/atlas/datalake/update_test.go
rename to internal/cli/datalake/update_test.go
diff --git a/internal/cli/atlas/datalakepipelines/availableschedules/available_schedules.go b/internal/cli/datalakepipelines/availableschedules/available_schedules.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/availableschedules/available_schedules.go
rename to internal/cli/datalakepipelines/availableschedules/available_schedules.go
diff --git a/internal/cli/atlas/datalakepipelines/availableschedules/available_schedules_test.go b/internal/cli/datalakepipelines/availableschedules/available_schedules_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/availableschedules/available_schedules_test.go
rename to internal/cli/datalakepipelines/availableschedules/available_schedules_test.go
diff --git a/internal/cli/atlas/datalakepipelines/availableschedules/list.go b/internal/cli/datalakepipelines/availableschedules/list.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/availableschedules/list.go
rename to internal/cli/datalakepipelines/availableschedules/list.go
diff --git a/internal/cli/atlas/datalakepipelines/availableschedules/list_test.go b/internal/cli/datalakepipelines/availableschedules/list_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/availableschedules/list_test.go
rename to internal/cli/datalakepipelines/availableschedules/list_test.go
diff --git a/internal/cli/atlas/datalakepipelines/availablesnapshots/available_snapshots.go b/internal/cli/datalakepipelines/availablesnapshots/available_snapshots.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/availablesnapshots/available_snapshots.go
rename to internal/cli/datalakepipelines/availablesnapshots/available_snapshots.go
diff --git a/internal/cli/atlas/datalakepipelines/availablesnapshots/available_snapshots_test.go b/internal/cli/datalakepipelines/availablesnapshots/available_snapshots_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/availablesnapshots/available_snapshots_test.go
rename to internal/cli/datalakepipelines/availablesnapshots/available_snapshots_test.go
diff --git a/internal/cli/atlas/datalakepipelines/availablesnapshots/list.go b/internal/cli/datalakepipelines/availablesnapshots/list.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/availablesnapshots/list.go
rename to internal/cli/datalakepipelines/availablesnapshots/list.go
diff --git a/internal/cli/atlas/datalakepipelines/availablesnapshots/list_test.go b/internal/cli/datalakepipelines/availablesnapshots/list_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/availablesnapshots/list_test.go
rename to internal/cli/datalakepipelines/availablesnapshots/list_test.go
diff --git a/internal/cli/atlas/datalakepipelines/create.go b/internal/cli/datalakepipelines/create.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/create.go
rename to internal/cli/datalakepipelines/create.go
diff --git a/internal/cli/atlas/datalakepipelines/create_test.go b/internal/cli/datalakepipelines/create_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/create_test.go
rename to internal/cli/datalakepipelines/create_test.go
diff --git a/internal/cli/atlas/datalakepipelines/data_lake_pipelines.go b/internal/cli/datalakepipelines/data_lake_pipelines.go
similarity index 80%
rename from internal/cli/atlas/datalakepipelines/data_lake_pipelines.go
rename to internal/cli/datalakepipelines/data_lake_pipelines.go
index 6067fc7d40..9c734fef68 100644
--- a/internal/cli/atlas/datalakepipelines/data_lake_pipelines.go
+++ b/internal/cli/datalakepipelines/data_lake_pipelines.go
@@ -18,10 +18,10 @@ package datalakepipelines
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datalakepipelines/availableschedules"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datalakepipelines/availablesnapshots"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datalakepipelines/datasets"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datalakepipelines/runs"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datalakepipelines/availableschedules"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datalakepipelines/availablesnapshots"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datalakepipelines/datasets"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datalakepipelines/runs"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/datalakepipelines/data_lake_pipelines_test.go b/internal/cli/datalakepipelines/data_lake_pipelines_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/data_lake_pipelines_test.go
rename to internal/cli/datalakepipelines/data_lake_pipelines_test.go
diff --git a/internal/cli/atlas/datalakepipelines/datasets/datasets.go b/internal/cli/datalakepipelines/datasets/datasets.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/datasets/datasets.go
rename to internal/cli/datalakepipelines/datasets/datasets.go
diff --git a/internal/cli/atlas/datalakepipelines/datasets/datasets_test.go b/internal/cli/datalakepipelines/datasets/datasets_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/datasets/datasets_test.go
rename to internal/cli/datalakepipelines/datasets/datasets_test.go
diff --git a/internal/cli/atlas/datalakepipelines/datasets/delete.go b/internal/cli/datalakepipelines/datasets/delete.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/datasets/delete.go
rename to internal/cli/datalakepipelines/datasets/delete.go
diff --git a/internal/cli/atlas/datalakepipelines/datasets/delete_test.go b/internal/cli/datalakepipelines/datasets/delete_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/datasets/delete_test.go
rename to internal/cli/datalakepipelines/datasets/delete_test.go
diff --git a/internal/cli/atlas/datalakepipelines/delete.go b/internal/cli/datalakepipelines/delete.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/delete.go
rename to internal/cli/datalakepipelines/delete.go
diff --git a/internal/cli/atlas/datalakepipelines/delete_test.go b/internal/cli/datalakepipelines/delete_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/delete_test.go
rename to internal/cli/datalakepipelines/delete_test.go
diff --git a/internal/cli/atlas/datalakepipelines/describe.go b/internal/cli/datalakepipelines/describe.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/describe.go
rename to internal/cli/datalakepipelines/describe.go
diff --git a/internal/cli/atlas/datalakepipelines/describe_test.go b/internal/cli/datalakepipelines/describe_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/describe_test.go
rename to internal/cli/datalakepipelines/describe_test.go
diff --git a/internal/cli/atlas/datalakepipelines/list.go b/internal/cli/datalakepipelines/list.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/list.go
rename to internal/cli/datalakepipelines/list.go
diff --git a/internal/cli/atlas/datalakepipelines/list_test.go b/internal/cli/datalakepipelines/list_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/list_test.go
rename to internal/cli/datalakepipelines/list_test.go
diff --git a/internal/cli/atlas/datalakepipelines/pause.go b/internal/cli/datalakepipelines/pause.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/pause.go
rename to internal/cli/datalakepipelines/pause.go
diff --git a/internal/cli/atlas/datalakepipelines/pause_test.go b/internal/cli/datalakepipelines/pause_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/pause_test.go
rename to internal/cli/datalakepipelines/pause_test.go
diff --git a/internal/cli/atlas/datalakepipelines/runs/describe.go b/internal/cli/datalakepipelines/runs/describe.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/runs/describe.go
rename to internal/cli/datalakepipelines/runs/describe.go
diff --git a/internal/cli/atlas/datalakepipelines/runs/describe_test.go b/internal/cli/datalakepipelines/runs/describe_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/runs/describe_test.go
rename to internal/cli/datalakepipelines/runs/describe_test.go
diff --git a/internal/cli/atlas/datalakepipelines/runs/list.go b/internal/cli/datalakepipelines/runs/list.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/runs/list.go
rename to internal/cli/datalakepipelines/runs/list.go
diff --git a/internal/cli/atlas/datalakepipelines/runs/list_test.go b/internal/cli/datalakepipelines/runs/list_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/runs/list_test.go
rename to internal/cli/datalakepipelines/runs/list_test.go
diff --git a/internal/cli/atlas/datalakepipelines/runs/runs.go b/internal/cli/datalakepipelines/runs/runs.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/runs/runs.go
rename to internal/cli/datalakepipelines/runs/runs.go
diff --git a/internal/cli/atlas/datalakepipelines/runs/runs_test.go b/internal/cli/datalakepipelines/runs/runs_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/runs/runs_test.go
rename to internal/cli/datalakepipelines/runs/runs_test.go
diff --git a/internal/cli/atlas/datalakepipelines/runs/watch.go b/internal/cli/datalakepipelines/runs/watch.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/runs/watch.go
rename to internal/cli/datalakepipelines/runs/watch.go
diff --git a/internal/cli/atlas/datalakepipelines/runs/watch_test.go b/internal/cli/datalakepipelines/runs/watch_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/runs/watch_test.go
rename to internal/cli/datalakepipelines/runs/watch_test.go
diff --git a/internal/cli/atlas/datalakepipelines/start.go b/internal/cli/datalakepipelines/start.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/start.go
rename to internal/cli/datalakepipelines/start.go
diff --git a/internal/cli/atlas/datalakepipelines/start_test.go b/internal/cli/datalakepipelines/start_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/start_test.go
rename to internal/cli/datalakepipelines/start_test.go
diff --git a/internal/cli/atlas/datalakepipelines/trigger.go b/internal/cli/datalakepipelines/trigger.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/trigger.go
rename to internal/cli/datalakepipelines/trigger.go
diff --git a/internal/cli/atlas/datalakepipelines/trigger_test.go b/internal/cli/datalakepipelines/trigger_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/trigger_test.go
rename to internal/cli/datalakepipelines/trigger_test.go
diff --git a/internal/cli/atlas/datalakepipelines/update.go b/internal/cli/datalakepipelines/update.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/update.go
rename to internal/cli/datalakepipelines/update.go
diff --git a/internal/cli/atlas/datalakepipelines/update_test.go b/internal/cli/datalakepipelines/update_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/update_test.go
rename to internal/cli/datalakepipelines/update_test.go
diff --git a/internal/cli/atlas/datalakepipelines/watch.go b/internal/cli/datalakepipelines/watch.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/watch.go
rename to internal/cli/datalakepipelines/watch.go
diff --git a/internal/cli/atlas/datalakepipelines/watch_test.go b/internal/cli/datalakepipelines/watch_test.go
similarity index 100%
rename from internal/cli/atlas/datalakepipelines/watch_test.go
rename to internal/cli/datalakepipelines/watch_test.go
diff --git a/internal/cli/atlas/dbusers/certs/certs.go b/internal/cli/dbusers/certs/certs.go
similarity index 100%
rename from internal/cli/atlas/dbusers/certs/certs.go
rename to internal/cli/dbusers/certs/certs.go
diff --git a/internal/cli/atlas/dbusers/certs/create.go b/internal/cli/dbusers/certs/create.go
similarity index 100%
rename from internal/cli/atlas/dbusers/certs/create.go
rename to internal/cli/dbusers/certs/create.go
diff --git a/internal/cli/atlas/dbusers/certs/create_test.go b/internal/cli/dbusers/certs/create_test.go
similarity index 100%
rename from internal/cli/atlas/dbusers/certs/create_test.go
rename to internal/cli/dbusers/certs/create_test.go
diff --git a/internal/cli/atlas/dbusers/certs/list.go b/internal/cli/dbusers/certs/list.go
similarity index 100%
rename from internal/cli/atlas/dbusers/certs/list.go
rename to internal/cli/dbusers/certs/list.go
diff --git a/internal/cli/atlas/dbusers/certs/list_test.go b/internal/cli/dbusers/certs/list_test.go
similarity index 100%
rename from internal/cli/atlas/dbusers/certs/list_test.go
rename to internal/cli/dbusers/certs/list_test.go
diff --git a/internal/cli/atlas/dbusers/create.go b/internal/cli/dbusers/create.go
similarity index 100%
rename from internal/cli/atlas/dbusers/create.go
rename to internal/cli/dbusers/create.go
diff --git a/internal/cli/atlas/dbusers/create_test.go b/internal/cli/dbusers/create_test.go
similarity index 100%
rename from internal/cli/atlas/dbusers/create_test.go
rename to internal/cli/dbusers/create_test.go
diff --git a/internal/cli/atlas/dbusers/dbusers.go b/internal/cli/dbusers/dbusers.go
similarity index 94%
rename from internal/cli/atlas/dbusers/dbusers.go
rename to internal/cli/dbusers/dbusers.go
index 61e88f3ff8..0fc50d7e61 100644
--- a/internal/cli/atlas/dbusers/dbusers.go
+++ b/internal/cli/dbusers/dbusers.go
@@ -16,7 +16,7 @@ package dbusers
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/dbusers/certs"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/dbusers/certs"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/dbusers/dbusers_test.go b/internal/cli/dbusers/dbusers_test.go
similarity index 100%
rename from internal/cli/atlas/dbusers/dbusers_test.go
rename to internal/cli/dbusers/dbusers_test.go
diff --git a/internal/cli/atlas/dbusers/delete.go b/internal/cli/dbusers/delete.go
similarity index 100%
rename from internal/cli/atlas/dbusers/delete.go
rename to internal/cli/dbusers/delete.go
diff --git a/internal/cli/atlas/dbusers/delete_test.go b/internal/cli/dbusers/delete_test.go
similarity index 100%
rename from internal/cli/atlas/dbusers/delete_test.go
rename to internal/cli/dbusers/delete_test.go
diff --git a/internal/cli/atlas/dbusers/describe.go b/internal/cli/dbusers/describe.go
similarity index 100%
rename from internal/cli/atlas/dbusers/describe.go
rename to internal/cli/dbusers/describe.go
diff --git a/internal/cli/atlas/dbusers/describe_test.go b/internal/cli/dbusers/describe_test.go
similarity index 100%
rename from internal/cli/atlas/dbusers/describe_test.go
rename to internal/cli/dbusers/describe_test.go
diff --git a/internal/cli/atlas/dbusers/list.go b/internal/cli/dbusers/list.go
similarity index 100%
rename from internal/cli/atlas/dbusers/list.go
rename to internal/cli/dbusers/list.go
diff --git a/internal/cli/atlas/dbusers/list_test.go b/internal/cli/dbusers/list_test.go
similarity index 100%
rename from internal/cli/atlas/dbusers/list_test.go
rename to internal/cli/dbusers/list_test.go
diff --git a/internal/cli/atlas/dbusers/update.go b/internal/cli/dbusers/update.go
similarity index 100%
rename from internal/cli/atlas/dbusers/update.go
rename to internal/cli/dbusers/update.go
diff --git a/internal/cli/atlas/dbusers/update_test.go b/internal/cli/dbusers/update_test.go
similarity index 100%
rename from internal/cli/atlas/dbusers/update_test.go
rename to internal/cli/dbusers/update_test.go
diff --git a/internal/cli/default_setter_opts.go b/internal/cli/default_setter_opts.go
index 16dfc2c5b9..eb67f3335a 100644
--- a/internal/cli/default_setter_opts.go
+++ b/internal/cli/default_setter_opts.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/briandowns/spinner"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/pointer"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/prompt"
diff --git a/internal/cli/atlas/deployments/connect.go b/internal/cli/deployments/connect.go
similarity index 97%
rename from internal/cli/atlas/deployments/connect.go
rename to internal/cli/deployments/connect.go
index adf41327e1..1c3b17be79 100644
--- a/internal/cli/atlas/deployments/connect.go
+++ b/internal/cli/deployments/connect.go
@@ -17,7 +17,7 @@ package deployments
 import (
 	"context"
 
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
diff --git a/internal/cli/atlas/deployments/connect_test.go b/internal/cli/deployments/connect_test.go
similarity index 98%
rename from internal/cli/atlas/deployments/connect_test.go
rename to internal/cli/deployments/connect_test.go
index 8ea3d0a925..19fac849ef 100644
--- a/internal/cli/atlas/deployments/connect_test.go
+++ b/internal/cli/deployments/connect_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
diff --git a/internal/cli/atlas/deployments/delete.go b/internal/cli/deployments/delete.go
similarity index 98%
rename from internal/cli/atlas/deployments/delete.go
rename to internal/cli/deployments/delete.go
index 8e531bad7b..99645b9565 100644
--- a/internal/cli/atlas/deployments/delete.go
+++ b/internal/cli/deployments/delete.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/deployments/delete_test.go b/internal/cli/deployments/delete_test.go
similarity index 96%
rename from internal/cli/atlas/deployments/delete_test.go
rename to internal/cli/deployments/delete_test.go
index 4a424811b6..0e076079f0 100644
--- a/internal/cli/atlas/deployments/delete_test.go
+++ b/internal/cli/deployments/delete_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
diff --git a/internal/cli/atlas/deployments/deployments.go b/internal/cli/deployments/deployments.go
similarity index 93%
rename from internal/cli/atlas/deployments/deployments.go
rename to internal/cli/deployments/deployments.go
index 7d6ef8d565..e4cfce2fa0 100644
--- a/internal/cli/atlas/deployments/deployments.go
+++ b/internal/cli/deployments/deployments.go
@@ -16,7 +16,7 @@ package deployments
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/search"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/search"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/deployments/deployments_test.go b/internal/cli/deployments/deployments_test.go
similarity index 100%
rename from internal/cli/atlas/deployments/deployments_test.go
rename to internal/cli/deployments/deployments_test.go
diff --git a/internal/cli/atlas/deployments/diagnostics.go b/internal/cli/deployments/diagnostics.go
similarity index 97%
rename from internal/cli/atlas/deployments/diagnostics.go
rename to internal/cli/deployments/diagnostics.go
index cd20dcae11..4519a8c003 100644
--- a/internal/cli/atlas/deployments/diagnostics.go
+++ b/internal/cli/deployments/diagnostics.go
@@ -19,7 +19,7 @@ import (
 	"runtime"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
 	"github.com/spf13/cobra"
diff --git a/internal/cli/atlas/deployments/list.go b/internal/cli/deployments/list.go
similarity index 97%
rename from internal/cli/atlas/deployments/list.go
rename to internal/cli/deployments/list.go
index 25e169f7fe..dd6e12dadb 100644
--- a/internal/cli/atlas/deployments/list.go
+++ b/internal/cli/deployments/list.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
diff --git a/internal/cli/atlas/deployments/list_test.go b/internal/cli/deployments/list_test.go
similarity index 96%
rename from internal/cli/atlas/deployments/list_test.go
rename to internal/cli/deployments/list_test.go
index 23dbc9d9dc..310e01f265 100644
--- a/internal/cli/atlas/deployments/list_test.go
+++ b/internal/cli/deployments/list_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
diff --git a/internal/cli/atlas/deployments/logs.go b/internal/cli/deployments/logs.go
similarity index 98%
rename from internal/cli/atlas/deployments/logs.go
rename to internal/cli/deployments/logs.go
index bab5bea6da..1216c0926a 100644
--- a/internal/cli/atlas/deployments/logs.go
+++ b/internal/cli/deployments/logs.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/deployments/logs_test.go b/internal/cli/deployments/logs_test.go
similarity index 94%
rename from internal/cli/atlas/deployments/logs_test.go
rename to internal/cli/deployments/logs_test.go
index bdd34775b6..091f28fcb6 100644
--- a/internal/cli/atlas/deployments/logs_test.go
+++ b/internal/cli/deployments/logs_test.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/test"
diff --git a/internal/cli/atlas/deployments/options/connect_opts.go b/internal/cli/deployments/options/connect_opts.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/connect_opts.go
rename to internal/cli/deployments/options/connect_opts.go
diff --git a/internal/cli/atlas/deployments/options/connect_opts_atlas.go b/internal/cli/deployments/options/connect_opts_atlas.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/connect_opts_atlas.go
rename to internal/cli/deployments/options/connect_opts_atlas.go
diff --git a/internal/cli/atlas/deployments/options/connect_opts_local.go b/internal/cli/deployments/options/connect_opts_local.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/connect_opts_local.go
rename to internal/cli/deployments/options/connect_opts_local.go
diff --git a/internal/cli/atlas/deployments/options/deployment_opts.go b/internal/cli/deployments/options/deployment_opts.go
similarity index 99%
rename from internal/cli/atlas/deployments/options/deployment_opts.go
rename to internal/cli/deployments/options/deployment_opts.go
index 384145b177..b22cb7a950 100644
--- a/internal/cli/atlas/deployments/options/deployment_opts.go
+++ b/internal/cli/deployments/options/deployment_opts.go
@@ -27,7 +27,7 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/briandowns/spinner"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/setup"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/setup"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/log"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
diff --git a/internal/cli/atlas/deployments/options/deployment_opts_connect_string.go b/internal/cli/deployments/options/deployment_opts_connect_string.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/deployment_opts_connect_string.go
rename to internal/cli/deployments/options/deployment_opts_connect_string.go
diff --git a/internal/cli/atlas/deployments/options/deployment_opts_connect_with.go b/internal/cli/deployments/options/deployment_opts_connect_with.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/deployment_opts_connect_with.go
rename to internal/cli/deployments/options/deployment_opts_connect_with.go
diff --git a/internal/cli/atlas/deployments/options/deployment_opts_mongot.go b/internal/cli/deployments/options/deployment_opts_mongot.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/deployment_opts_mongot.go
rename to internal/cli/deployments/options/deployment_opts_mongot.go
diff --git a/internal/cli/atlas/deployments/options/deployment_opts_post_run.go b/internal/cli/deployments/options/deployment_opts_post_run.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/deployment_opts_post_run.go
rename to internal/cli/deployments/options/deployment_opts_post_run.go
diff --git a/internal/cli/atlas/deployments/options/deployment_opts_pre_run.go b/internal/cli/deployments/options/deployment_opts_pre_run.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/deployment_opts_pre_run.go
rename to internal/cli/deployments/options/deployment_opts_pre_run.go
diff --git a/internal/cli/atlas/deployments/options/deployment_opts_remove.go b/internal/cli/deployments/options/deployment_opts_remove.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/deployment_opts_remove.go
rename to internal/cli/deployments/options/deployment_opts_remove.go
diff --git a/internal/cli/atlas/deployments/options/deployment_opts_select.go b/internal/cli/deployments/options/deployment_opts_select.go
similarity index 100%
rename from internal/cli/atlas/deployments/options/deployment_opts_select.go
rename to internal/cli/deployments/options/deployment_opts_select.go
diff --git a/internal/cli/atlas/deployments/options/deployment_opts_telemetry.go b/internal/cli/deployments/options/deployment_opts_telemetry.go
similarity index 84%
rename from internal/cli/atlas/deployments/options/deployment_opts_telemetry.go
rename to internal/cli/deployments/options/deployment_opts_telemetry.go
index e803341ef6..6072c53236 100644
--- a/internal/cli/atlas/deployments/options/deployment_opts_telemetry.go
+++ b/internal/cli/deployments/options/deployment_opts_telemetry.go
@@ -18,7 +18,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/telemetry"
 )
 
-//go:generate mockgen -destination=../../../../mocks/mock_deployment_opts_telemetry.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options DeploymentTelemetry
+//go:generate mockgen -destination=../../../mocks/mock_deployment_opts_telemetry.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options DeploymentTelemetry
 type DeploymentTelemetry interface {
 	AppendDeploymentType()
 }
diff --git a/internal/cli/atlas/deployments/pause.go b/internal/cli/deployments/pause.go
similarity index 96%
rename from internal/cli/atlas/deployments/pause.go
rename to internal/cli/deployments/pause.go
index 18df08f44e..3fa2c0a88a 100644
--- a/internal/cli/atlas/deployments/pause.go
+++ b/internal/cli/deployments/pause.go
@@ -20,9 +20,9 @@ import (
 	"os/exec"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/setup"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/setup"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/log"
diff --git a/internal/cli/atlas/deployments/pause_test.go b/internal/cli/deployments/pause_test.go
similarity index 97%
rename from internal/cli/atlas/deployments/pause_test.go
rename to internal/cli/deployments/pause_test.go
index f10c37395e..0bdfcccc9a 100644
--- a/internal/cli/atlas/deployments/pause_test.go
+++ b/internal/cli/deployments/pause_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/pointer"
diff --git a/internal/cli/atlas/deployments/scripts/start_mongod.sh b/internal/cli/deployments/scripts/start_mongod.sh
similarity index 100%
rename from internal/cli/atlas/deployments/scripts/start_mongod.sh
rename to internal/cli/deployments/scripts/start_mongod.sh
diff --git a/internal/cli/atlas/deployments/scripts/start_mongot.sh b/internal/cli/deployments/scripts/start_mongot.sh
similarity index 100%
rename from internal/cli/atlas/deployments/scripts/start_mongot.sh
rename to internal/cli/deployments/scripts/start_mongot.sh
diff --git a/internal/cli/atlas/deployments/search/indexes/create.go b/internal/cli/deployments/search/indexes/create.go
similarity index 98%
rename from internal/cli/atlas/deployments/search/indexes/create.go
rename to internal/cli/deployments/search/indexes/create.go
index fd4dd0274e..504d5e7762 100644
--- a/internal/cli/atlas/deployments/search/indexes/create.go
+++ b/internal/cli/deployments/search/indexes/create.go
@@ -20,9 +20,9 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mongodbclient"
diff --git a/internal/cli/atlas/deployments/search/indexes/create_test.go b/internal/cli/deployments/search/indexes/create_test.go
similarity index 97%
rename from internal/cli/atlas/deployments/search/indexes/create_test.go
rename to internal/cli/deployments/search/indexes/create_test.go
index b69728e4e8..f899193c6c 100644
--- a/internal/cli/atlas/deployments/search/indexes/create_test.go
+++ b/internal/cli/deployments/search/indexes/create_test.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mongodbclient"
diff --git a/internal/cli/atlas/deployments/search/indexes/delete.go b/internal/cli/deployments/search/indexes/delete.go
similarity index 96%
rename from internal/cli/atlas/deployments/search/indexes/delete.go
rename to internal/cli/deployments/search/indexes/delete.go
index 9dda6b1781..64de1a4132 100644
--- a/internal/cli/atlas/deployments/search/indexes/delete.go
+++ b/internal/cli/deployments/search/indexes/delete.go
@@ -18,9 +18,9 @@ import (
 	"context"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mongodbclient"
diff --git a/internal/cli/atlas/deployments/search/indexes/delete_test.go b/internal/cli/deployments/search/indexes/delete_test.go
similarity index 95%
rename from internal/cli/atlas/deployments/search/indexes/delete_test.go
rename to internal/cli/deployments/search/indexes/delete_test.go
index 4cf51cb8dc..ae1a214727 100644
--- a/internal/cli/atlas/deployments/search/indexes/delete_test.go
+++ b/internal/cli/deployments/search/indexes/delete_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
diff --git a/internal/cli/atlas/deployments/search/indexes/describe.go b/internal/cli/deployments/search/indexes/describe.go
similarity index 96%
rename from internal/cli/atlas/deployments/search/indexes/describe.go
rename to internal/cli/deployments/search/indexes/describe.go
index d1eee17dcc..22f4fe1ef6 100644
--- a/internal/cli/atlas/deployments/search/indexes/describe.go
+++ b/internal/cli/deployments/search/indexes/describe.go
@@ -18,9 +18,9 @@ import (
 	"context"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mongodbclient"
diff --git a/internal/cli/atlas/deployments/search/indexes/describe_test.go b/internal/cli/deployments/search/indexes/describe_test.go
similarity index 96%
rename from internal/cli/atlas/deployments/search/indexes/describe_test.go
rename to internal/cli/deployments/search/indexes/describe_test.go
index 281092130c..ba96ebc565 100644
--- a/internal/cli/atlas/deployments/search/indexes/describe_test.go
+++ b/internal/cli/deployments/search/indexes/describe_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
diff --git a/internal/cli/atlas/deployments/search/indexes/indexes.go b/internal/cli/deployments/search/indexes/indexes.go
similarity index 100%
rename from internal/cli/atlas/deployments/search/indexes/indexes.go
rename to internal/cli/deployments/search/indexes/indexes.go
diff --git a/internal/cli/atlas/deployments/search/indexes/indexes_test.go b/internal/cli/deployments/search/indexes/indexes_test.go
similarity index 100%
rename from internal/cli/atlas/deployments/search/indexes/indexes_test.go
rename to internal/cli/deployments/search/indexes/indexes_test.go
diff --git a/internal/cli/atlas/deployments/search/indexes/list.go b/internal/cli/deployments/search/indexes/list.go
similarity index 96%
rename from internal/cli/atlas/deployments/search/indexes/list.go
rename to internal/cli/deployments/search/indexes/list.go
index 2803bf8b15..88dbcb9e99 100644
--- a/internal/cli/atlas/deployments/search/indexes/list.go
+++ b/internal/cli/deployments/search/indexes/list.go
@@ -18,9 +18,9 @@ import (
 	"context"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mongodbclient"
diff --git a/internal/cli/atlas/deployments/search/indexes/list_test.go b/internal/cli/deployments/search/indexes/list_test.go
similarity index 95%
rename from internal/cli/atlas/deployments/search/indexes/list_test.go
rename to internal/cli/deployments/search/indexes/list_test.go
index 91a9974044..f13b3d0743 100644
--- a/internal/cli/atlas/deployments/search/indexes/list_test.go
+++ b/internal/cli/deployments/search/indexes/list_test.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
diff --git a/internal/cli/atlas/deployments/search/search.go b/internal/cli/deployments/search/search.go
similarity index 90%
rename from internal/cli/atlas/deployments/search/search.go
rename to internal/cli/deployments/search/search.go
index 2b01b54a6f..09ae7016af 100644
--- a/internal/cli/atlas/deployments/search/search.go
+++ b/internal/cli/deployments/search/search.go
@@ -15,7 +15,7 @@
 package search
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/search/indexes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/search/indexes"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/deployments/search/search_test.go b/internal/cli/deployments/search/search_test.go
similarity index 100%
rename from internal/cli/atlas/deployments/search/search_test.go
rename to internal/cli/deployments/search/search_test.go
diff --git a/internal/cli/atlas/deployments/setup.go b/internal/cli/deployments/setup.go
similarity index 99%
rename from internal/cli/atlas/deployments/setup.go
rename to internal/cli/deployments/setup.go
index 714d16a83c..c44e2ded89 100644
--- a/internal/cli/atlas/deployments/setup.go
+++ b/internal/cli/deployments/setup.go
@@ -32,9 +32,9 @@ import (
 	"github.com/briandowns/spinner"
 	"github.com/google/uuid"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/setup"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/setup"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/workflows"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/compass"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/deployments/start.go b/internal/cli/deployments/start.go
similarity index 98%
rename from internal/cli/atlas/deployments/start.go
rename to internal/cli/deployments/start.go
index 83293e4a3d..6351b96ae0 100644
--- a/internal/cli/atlas/deployments/start.go
+++ b/internal/cli/deployments/start.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/deployments/start_test.go b/internal/cli/deployments/start_test.go
similarity index 98%
rename from internal/cli/atlas/deployments/start_test.go
rename to internal/cli/deployments/start_test.go
index 8d7cd48248..9cfe6b20c1 100644
--- a/internal/cli/atlas/deployments/start_test.go
+++ b/internal/cli/deployments/start_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/test/fixture"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/test/fixture"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
diff --git a/internal/cli/atlas/deployments/test/fixture/deployment.go b/internal/cli/deployments/test/fixture/deployment.go
similarity index 92%
rename from internal/cli/atlas/deployments/test/fixture/deployment.go
rename to internal/cli/deployments/test/fixture/deployment.go
index ff6afc58ce..98ae6aef69 100644
--- a/internal/cli/atlas/deployments/test/fixture/deployment.go
+++ b/internal/cli/deployments/test/fixture/deployment.go
@@ -15,7 +15,7 @@ package fixture
 
 import (
 	"github.com/golang/mock/gomock"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 )
 
diff --git a/internal/cli/atlas/deployments/test/fixture/deployment_atlas.go b/internal/cli/deployments/test/fixture/deployment_atlas.go
similarity index 96%
rename from internal/cli/atlas/deployments/test/fixture/deployment_atlas.go
rename to internal/cli/deployments/test/fixture/deployment_atlas.go
index b8c45bdd27..2f26c8c883 100644
--- a/internal/cli/atlas/deployments/test/fixture/deployment_atlas.go
+++ b/internal/cli/deployments/test/fixture/deployment_atlas.go
@@ -15,7 +15,7 @@ package fixture
 
 import (
 	"github.com/golang/mock/gomock"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/pointer"
diff --git a/internal/cli/atlas/deployments/test/fixture/deployment_local.go b/internal/cli/deployments/test/fixture/deployment_local.go
similarity index 96%
rename from internal/cli/atlas/deployments/test/fixture/deployment_local.go
rename to internal/cli/deployments/test/fixture/deployment_local.go
index 82329895f2..8873b03392 100644
--- a/internal/cli/atlas/deployments/test/fixture/deployment_local.go
+++ b/internal/cli/deployments/test/fixture/deployment_local.go
@@ -17,7 +17,7 @@ import (
 	"context"
 
 	"github.com/golang/mock/gomock"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/podman"
 )
diff --git a/internal/cli/atlas/events/events.go b/internal/cli/events/events.go
similarity index 100%
rename from internal/cli/atlas/events/events.go
rename to internal/cli/events/events.go
diff --git a/internal/cli/atlas/events/events_test.go b/internal/cli/events/events_test.go
similarity index 100%
rename from internal/cli/atlas/events/events_test.go
rename to internal/cli/events/events_test.go
diff --git a/internal/cli/atlas/events/list.go b/internal/cli/events/list.go
similarity index 100%
rename from internal/cli/atlas/events/list.go
rename to internal/cli/events/list.go
diff --git a/internal/cli/atlas/events/list_test.go b/internal/cli/events/list_test.go
similarity index 100%
rename from internal/cli/atlas/events/list_test.go
rename to internal/cli/events/list_test.go
diff --git a/internal/cli/atlas/events/orgs_list.go b/internal/cli/events/orgs_list.go
similarity index 100%
rename from internal/cli/atlas/events/orgs_list.go
rename to internal/cli/events/orgs_list.go
diff --git a/internal/cli/atlas/events/orgs_list_test.go b/internal/cli/events/orgs_list_test.go
similarity index 100%
rename from internal/cli/atlas/events/orgs_list_test.go
rename to internal/cli/events/orgs_list_test.go
diff --git a/internal/cli/atlas/events/projects_list.go b/internal/cli/events/projects_list.go
similarity index 100%
rename from internal/cli/atlas/events/projects_list.go
rename to internal/cli/events/projects_list.go
diff --git a/internal/cli/atlas/events/projects_list_test.go b/internal/cli/events/projects_list_test.go
similarity index 100%
rename from internal/cli/atlas/events/projects_list_test.go
rename to internal/cli/events/projects_list_test.go
diff --git a/internal/cli/atlas/integrations/create/create.go b/internal/cli/integrations/create/create.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/create.go
rename to internal/cli/integrations/create/create.go
diff --git a/internal/cli/atlas/integrations/create/create_test.go b/internal/cli/integrations/create/create_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/create_test.go
rename to internal/cli/integrations/create/create_test.go
diff --git a/internal/cli/atlas/integrations/create/datadog.go b/internal/cli/integrations/create/datadog.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/datadog.go
rename to internal/cli/integrations/create/datadog.go
diff --git a/internal/cli/atlas/integrations/create/datadog_test.go b/internal/cli/integrations/create/datadog_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/datadog_test.go
rename to internal/cli/integrations/create/datadog_test.go
diff --git a/internal/cli/atlas/integrations/create/new_relic.go b/internal/cli/integrations/create/new_relic.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/new_relic.go
rename to internal/cli/integrations/create/new_relic.go
diff --git a/internal/cli/atlas/integrations/create/new_relic_test.go b/internal/cli/integrations/create/new_relic_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/new_relic_test.go
rename to internal/cli/integrations/create/new_relic_test.go
diff --git a/internal/cli/atlas/integrations/create/ops_genie.go b/internal/cli/integrations/create/ops_genie.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/ops_genie.go
rename to internal/cli/integrations/create/ops_genie.go
diff --git a/internal/cli/atlas/integrations/create/ops_genie_test.go b/internal/cli/integrations/create/ops_genie_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/ops_genie_test.go
rename to internal/cli/integrations/create/ops_genie_test.go
diff --git a/internal/cli/atlas/integrations/create/pager_duty.go b/internal/cli/integrations/create/pager_duty.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/pager_duty.go
rename to internal/cli/integrations/create/pager_duty.go
diff --git a/internal/cli/atlas/integrations/create/pager_duty_test.go b/internal/cli/integrations/create/pager_duty_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/pager_duty_test.go
rename to internal/cli/integrations/create/pager_duty_test.go
diff --git a/internal/cli/atlas/integrations/create/victor_ops.go b/internal/cli/integrations/create/victor_ops.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/victor_ops.go
rename to internal/cli/integrations/create/victor_ops.go
diff --git a/internal/cli/atlas/integrations/create/victor_ops_test.go b/internal/cli/integrations/create/victor_ops_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/victor_ops_test.go
rename to internal/cli/integrations/create/victor_ops_test.go
diff --git a/internal/cli/atlas/integrations/create/webhook.go b/internal/cli/integrations/create/webhook.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/webhook.go
rename to internal/cli/integrations/create/webhook.go
diff --git a/internal/cli/atlas/integrations/create/webhook_test.go b/internal/cli/integrations/create/webhook_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/create/webhook_test.go
rename to internal/cli/integrations/create/webhook_test.go
diff --git a/internal/cli/atlas/integrations/delete.go b/internal/cli/integrations/delete.go
similarity index 100%
rename from internal/cli/atlas/integrations/delete.go
rename to internal/cli/integrations/delete.go
diff --git a/internal/cli/atlas/integrations/delete_test.go b/internal/cli/integrations/delete_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/delete_test.go
rename to internal/cli/integrations/delete_test.go
diff --git a/internal/cli/atlas/integrations/describe.go b/internal/cli/integrations/describe.go
similarity index 100%
rename from internal/cli/atlas/integrations/describe.go
rename to internal/cli/integrations/describe.go
diff --git a/internal/cli/atlas/integrations/describe_test.go b/internal/cli/integrations/describe_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/describe_test.go
rename to internal/cli/integrations/describe_test.go
diff --git a/internal/cli/atlas/integrations/integrations.go b/internal/cli/integrations/integrations.go
similarity index 92%
rename from internal/cli/atlas/integrations/integrations.go
rename to internal/cli/integrations/integrations.go
index 3d06f70de4..e90f7afec1 100644
--- a/internal/cli/atlas/integrations/integrations.go
+++ b/internal/cli/integrations/integrations.go
@@ -16,7 +16,7 @@ package integrations
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/integrations/create"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/integrations/create"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/integrations/integrations_test.go b/internal/cli/integrations/integrations_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/integrations_test.go
rename to internal/cli/integrations/integrations_test.go
diff --git a/internal/cli/atlas/integrations/list.go b/internal/cli/integrations/list.go
similarity index 100%
rename from internal/cli/atlas/integrations/list.go
rename to internal/cli/integrations/list.go
diff --git a/internal/cli/atlas/integrations/list_test.go b/internal/cli/integrations/list_test.go
similarity index 100%
rename from internal/cli/atlas/integrations/list_test.go
rename to internal/cli/integrations/list_test.go
diff --git a/internal/cli/atlas/kubernetes/config/apply.go b/internal/cli/kubernetes/config/apply.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/config/apply.go
rename to internal/cli/kubernetes/config/apply.go
diff --git a/internal/cli/atlas/kubernetes/config/apply_test.go b/internal/cli/kubernetes/config/apply_test.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/config/apply_test.go
rename to internal/cli/kubernetes/config/apply_test.go
diff --git a/internal/cli/atlas/kubernetes/config/config.go b/internal/cli/kubernetes/config/config.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/config/config.go
rename to internal/cli/kubernetes/config/config.go
diff --git a/internal/cli/atlas/kubernetes/config/config_test.go b/internal/cli/kubernetes/config/config_test.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/config/config_test.go
rename to internal/cli/kubernetes/config/config_test.go
diff --git a/internal/cli/atlas/kubernetes/config/generate.go b/internal/cli/kubernetes/config/generate.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/config/generate.go
rename to internal/cli/kubernetes/config/generate.go
diff --git a/internal/cli/atlas/kubernetes/config/generate_test.go b/internal/cli/kubernetes/config/generate_test.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/config/generate_test.go
rename to internal/cli/kubernetes/config/generate_test.go
diff --git a/internal/cli/atlas/kubernetes/kubernetes.go b/internal/cli/kubernetes/kubernetes.go
similarity index 84%
rename from internal/cli/atlas/kubernetes/kubernetes.go
rename to internal/cli/kubernetes/kubernetes.go
index 6b1e7c53a4..a6fd92c6ac 100644
--- a/internal/cli/atlas/kubernetes/kubernetes.go
+++ b/internal/cli/kubernetes/kubernetes.go
@@ -15,8 +15,8 @@
 package kubernetes
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/kubernetes/config"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/kubernetes/operator"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/kubernetes/config"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/kubernetes/operator"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/kubernetes/kubernetes_test.go b/internal/cli/kubernetes/kubernetes_test.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/kubernetes_test.go
rename to internal/cli/kubernetes/kubernetes_test.go
diff --git a/internal/cli/atlas/kubernetes/operator/install.go b/internal/cli/kubernetes/operator/install.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/operator/install.go
rename to internal/cli/kubernetes/operator/install.go
diff --git a/internal/cli/atlas/kubernetes/operator/install_test.go b/internal/cli/kubernetes/operator/install_test.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/operator/install_test.go
rename to internal/cli/kubernetes/operator/install_test.go
diff --git a/internal/cli/atlas/kubernetes/operator/operator.go b/internal/cli/kubernetes/operator/operator.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/operator/operator.go
rename to internal/cli/kubernetes/operator/operator.go
diff --git a/internal/cli/atlas/kubernetes/operator/operator_test.go b/internal/cli/kubernetes/operator/operator_test.go
similarity index 100%
rename from internal/cli/atlas/kubernetes/operator/operator_test.go
rename to internal/cli/kubernetes/operator/operator_test.go
diff --git a/internal/cli/atlas/livemigrations/create.go b/internal/cli/livemigrations/create.go
similarity index 96%
rename from internal/cli/atlas/livemigrations/create.go
rename to internal/cli/livemigrations/create.go
index 528a02b0ad..129e7e9a9f 100644
--- a/internal/cli/atlas/livemigrations/create.go
+++ b/internal/cli/livemigrations/create.go
@@ -17,7 +17,7 @@ package livemigrations
 import (
 	"context"
 
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/livemigrations/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/livemigrations/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
 	"github.com/spf13/cobra"
diff --git a/internal/cli/atlas/livemigrations/create_test.go b/internal/cli/livemigrations/create_test.go
similarity index 96%
rename from internal/cli/atlas/livemigrations/create_test.go
rename to internal/cli/livemigrations/create_test.go
index 7bbdf8b1b3..202bcbf74d 100644
--- a/internal/cli/atlas/livemigrations/create_test.go
+++ b/internal/cli/livemigrations/create_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/livemigrations/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/livemigrations/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/test"
diff --git a/internal/cli/atlas/livemigrations/cutover.go b/internal/cli/livemigrations/cutover.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/cutover.go
rename to internal/cli/livemigrations/cutover.go
diff --git a/internal/cli/atlas/livemigrations/cutover_test.go b/internal/cli/livemigrations/cutover_test.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/cutover_test.go
rename to internal/cli/livemigrations/cutover_test.go
diff --git a/internal/cli/atlas/livemigrations/describe.go b/internal/cli/livemigrations/describe.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/describe.go
rename to internal/cli/livemigrations/describe.go
diff --git a/internal/cli/atlas/livemigrations/describe_test.go b/internal/cli/livemigrations/describe_test.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/describe_test.go
rename to internal/cli/livemigrations/describe_test.go
diff --git a/internal/cli/atlas/livemigrations/link/create.go b/internal/cli/livemigrations/link/create.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/link/create.go
rename to internal/cli/livemigrations/link/create.go
diff --git a/internal/cli/atlas/livemigrations/link/create_test.go b/internal/cli/livemigrations/link/create_test.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/link/create_test.go
rename to internal/cli/livemigrations/link/create_test.go
diff --git a/internal/cli/atlas/livemigrations/link/delete.go b/internal/cli/livemigrations/link/delete.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/link/delete.go
rename to internal/cli/livemigrations/link/delete.go
diff --git a/internal/cli/atlas/livemigrations/link/delete_test.go b/internal/cli/livemigrations/link/delete_test.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/link/delete_test.go
rename to internal/cli/livemigrations/link/delete_test.go
diff --git a/internal/cli/atlas/livemigrations/link/link.go b/internal/cli/livemigrations/link/link.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/link/link.go
rename to internal/cli/livemigrations/link/link.go
diff --git a/internal/cli/atlas/livemigrations/link/link_test.go b/internal/cli/livemigrations/link/link_test.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/link/link_test.go
rename to internal/cli/livemigrations/link/link_test.go
diff --git a/internal/cli/atlas/livemigrations/live_migrations.go b/internal/cli/livemigrations/live_migrations.go
similarity index 85%
rename from internal/cli/atlas/livemigrations/live_migrations.go
rename to internal/cli/livemigrations/live_migrations.go
index 3dc48cfd5e..8ed465e6e8 100644
--- a/internal/cli/atlas/livemigrations/live_migrations.go
+++ b/internal/cli/livemigrations/live_migrations.go
@@ -16,8 +16,8 @@ package livemigrations
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/livemigrations/link"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/livemigrations/validation"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/livemigrations/link"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/livemigrations/validation"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/livemigrations/live_migrations_test.go b/internal/cli/livemigrations/live_migrations_test.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/live_migrations_test.go
rename to internal/cli/livemigrations/live_migrations_test.go
diff --git a/internal/cli/atlas/livemigrations/options/live_migrations_opts.go b/internal/cli/livemigrations/options/live_migrations_opts.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/options/live_migrations_opts.go
rename to internal/cli/livemigrations/options/live_migrations_opts.go
diff --git a/internal/cli/atlas/livemigrations/validation/create.go b/internal/cli/livemigrations/validation/create.go
similarity index 96%
rename from internal/cli/atlas/livemigrations/validation/create.go
rename to internal/cli/livemigrations/validation/create.go
index 3822356b2d..07dd961942 100644
--- a/internal/cli/atlas/livemigrations/validation/create.go
+++ b/internal/cli/livemigrations/validation/create.go
@@ -17,7 +17,7 @@ package validation
 import (
 	"context"
 
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/livemigrations/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/livemigrations/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
 	"github.com/spf13/cobra"
diff --git a/internal/cli/atlas/livemigrations/validation/create_test.go b/internal/cli/livemigrations/validation/create_test.go
similarity index 96%
rename from internal/cli/atlas/livemigrations/validation/create_test.go
rename to internal/cli/livemigrations/validation/create_test.go
index 5f23306972..ea31c8c052 100644
--- a/internal/cli/atlas/livemigrations/validation/create_test.go
+++ b/internal/cli/livemigrations/validation/create_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/livemigrations/options"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/livemigrations/options"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/mocks"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/test"
diff --git a/internal/cli/atlas/livemigrations/validation/describe.go b/internal/cli/livemigrations/validation/describe.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/validation/describe.go
rename to internal/cli/livemigrations/validation/describe.go
diff --git a/internal/cli/atlas/livemigrations/validation/describe_test.go b/internal/cli/livemigrations/validation/describe_test.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/validation/describe_test.go
rename to internal/cli/livemigrations/validation/describe_test.go
diff --git a/internal/cli/atlas/livemigrations/validation/validation.go b/internal/cli/livemigrations/validation/validation.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/validation/validation.go
rename to internal/cli/livemigrations/validation/validation.go
diff --git a/internal/cli/atlas/livemigrations/validation/validation_test.go b/internal/cli/livemigrations/validation/validation_test.go
similarity index 100%
rename from internal/cli/atlas/livemigrations/validation/validation_test.go
rename to internal/cli/livemigrations/validation/validation_test.go
diff --git a/internal/cli/atlas/logs/decrypt.go b/internal/cli/logs/decrypt.go
similarity index 100%
rename from internal/cli/atlas/logs/decrypt.go
rename to internal/cli/logs/decrypt.go
diff --git a/internal/cli/atlas/logs/decrypt_test.go b/internal/cli/logs/decrypt_test.go
similarity index 100%
rename from internal/cli/atlas/logs/decrypt_test.go
rename to internal/cli/logs/decrypt_test.go
diff --git a/internal/cli/atlas/logs/download.go b/internal/cli/logs/download.go
similarity index 100%
rename from internal/cli/atlas/logs/download.go
rename to internal/cli/logs/download.go
diff --git a/internal/cli/atlas/logs/download_test.go b/internal/cli/logs/download_test.go
similarity index 100%
rename from internal/cli/atlas/logs/download_test.go
rename to internal/cli/logs/download_test.go
diff --git a/internal/cli/atlas/logs/logs.go b/internal/cli/logs/logs.go
similarity index 100%
rename from internal/cli/atlas/logs/logs.go
rename to internal/cli/logs/logs.go
diff --git a/internal/cli/atlas/logs/logs_test.go b/internal/cli/logs/logs_test.go
similarity index 100%
rename from internal/cli/atlas/logs/logs_test.go
rename to internal/cli/logs/logs_test.go
diff --git a/internal/cli/atlas/maintenance/clear.go b/internal/cli/maintenance/clear.go
similarity index 100%
rename from internal/cli/atlas/maintenance/clear.go
rename to internal/cli/maintenance/clear.go
diff --git a/internal/cli/atlas/maintenance/clear_test.go b/internal/cli/maintenance/clear_test.go
similarity index 100%
rename from internal/cli/atlas/maintenance/clear_test.go
rename to internal/cli/maintenance/clear_test.go
diff --git a/internal/cli/atlas/maintenance/defer.go b/internal/cli/maintenance/defer.go
similarity index 100%
rename from internal/cli/atlas/maintenance/defer.go
rename to internal/cli/maintenance/defer.go
diff --git a/internal/cli/atlas/maintenance/defer_test.go b/internal/cli/maintenance/defer_test.go
similarity index 100%
rename from internal/cli/atlas/maintenance/defer_test.go
rename to internal/cli/maintenance/defer_test.go
diff --git a/internal/cli/atlas/maintenance/describe.go b/internal/cli/maintenance/describe.go
similarity index 100%
rename from internal/cli/atlas/maintenance/describe.go
rename to internal/cli/maintenance/describe.go
diff --git a/internal/cli/atlas/maintenance/describe_test.go b/internal/cli/maintenance/describe_test.go
similarity index 100%
rename from internal/cli/atlas/maintenance/describe_test.go
rename to internal/cli/maintenance/describe_test.go
diff --git a/internal/cli/atlas/maintenance/maintenance.go b/internal/cli/maintenance/maintenance.go
similarity index 100%
rename from internal/cli/atlas/maintenance/maintenance.go
rename to internal/cli/maintenance/maintenance.go
diff --git a/internal/cli/atlas/maintenance/maintenance_test.go b/internal/cli/maintenance/maintenance_test.go
similarity index 100%
rename from internal/cli/atlas/maintenance/maintenance_test.go
rename to internal/cli/maintenance/maintenance_test.go
diff --git a/internal/cli/atlas/maintenance/update.go b/internal/cli/maintenance/update.go
similarity index 100%
rename from internal/cli/atlas/maintenance/update.go
rename to internal/cli/maintenance/update.go
diff --git a/internal/cli/atlas/maintenance/update_test.go b/internal/cli/maintenance/update_test.go
similarity index 100%
rename from internal/cli/atlas/maintenance/update_test.go
rename to internal/cli/maintenance/update_test.go
diff --git a/internal/cli/atlas/metrics/databases/databases.go b/internal/cli/metrics/databases/databases.go
similarity index 100%
rename from internal/cli/atlas/metrics/databases/databases.go
rename to internal/cli/metrics/databases/databases.go
diff --git a/internal/cli/atlas/metrics/databases/databases_test.go b/internal/cli/metrics/databases/databases_test.go
similarity index 100%
rename from internal/cli/atlas/metrics/databases/databases_test.go
rename to internal/cli/metrics/databases/databases_test.go
diff --git a/internal/cli/atlas/metrics/databases/describe.go b/internal/cli/metrics/databases/describe.go
similarity index 100%
rename from internal/cli/atlas/metrics/databases/describe.go
rename to internal/cli/metrics/databases/describe.go
diff --git a/internal/cli/atlas/metrics/databases/describe_test.go b/internal/cli/metrics/databases/describe_test.go
similarity index 100%
rename from internal/cli/atlas/metrics/databases/describe_test.go
rename to internal/cli/metrics/databases/describe_test.go
diff --git a/internal/cli/atlas/metrics/databases/list.go b/internal/cli/metrics/databases/list.go
similarity index 100%
rename from internal/cli/atlas/metrics/databases/list.go
rename to internal/cli/metrics/databases/list.go
diff --git a/internal/cli/atlas/metrics/databases/list_test.go b/internal/cli/metrics/databases/list_test.go
similarity index 100%
rename from internal/cli/atlas/metrics/databases/list_test.go
rename to internal/cli/metrics/databases/list_test.go
diff --git a/internal/cli/atlas/metrics/disks/describe.go b/internal/cli/metrics/disks/describe.go
similarity index 100%
rename from internal/cli/atlas/metrics/disks/describe.go
rename to internal/cli/metrics/disks/describe.go
diff --git a/internal/cli/atlas/metrics/disks/describe_test.go b/internal/cli/metrics/disks/describe_test.go
similarity index 100%
rename from internal/cli/atlas/metrics/disks/describe_test.go
rename to internal/cli/metrics/disks/describe_test.go
diff --git a/internal/cli/atlas/metrics/disks/disks.go b/internal/cli/metrics/disks/disks.go
similarity index 100%
rename from internal/cli/atlas/metrics/disks/disks.go
rename to internal/cli/metrics/disks/disks.go
diff --git a/internal/cli/atlas/metrics/disks/disks_test.go b/internal/cli/metrics/disks/disks_test.go
similarity index 100%
rename from internal/cli/atlas/metrics/disks/disks_test.go
rename to internal/cli/metrics/disks/disks_test.go
diff --git a/internal/cli/atlas/metrics/disks/list.go b/internal/cli/metrics/disks/list.go
similarity index 100%
rename from internal/cli/atlas/metrics/disks/list.go
rename to internal/cli/metrics/disks/list.go
diff --git a/internal/cli/atlas/metrics/disks/list_test.go b/internal/cli/metrics/disks/list_test.go
similarity index 100%
rename from internal/cli/atlas/metrics/disks/list_test.go
rename to internal/cli/metrics/disks/list_test.go
diff --git a/internal/cli/atlas/metrics/metrics.go b/internal/cli/metrics/metrics.go
similarity index 80%
rename from internal/cli/atlas/metrics/metrics.go
rename to internal/cli/metrics/metrics.go
index 4c0cb76513..d7fe789bc1 100644
--- a/internal/cli/atlas/metrics/metrics.go
+++ b/internal/cli/metrics/metrics.go
@@ -16,9 +16,9 @@ package metrics
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/metrics/databases"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/metrics/disks"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/metrics/processes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/metrics/databases"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/metrics/disks"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/metrics/processes"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/metrics/metrics_test.go b/internal/cli/metrics/metrics_test.go
similarity index 100%
rename from internal/cli/atlas/metrics/metrics_test.go
rename to internal/cli/metrics/metrics_test.go
diff --git a/internal/cli/atlas/metrics/processes/processes.go b/internal/cli/metrics/processes/processes.go
similarity index 100%
rename from internal/cli/atlas/metrics/processes/processes.go
rename to internal/cli/metrics/processes/processes.go
diff --git a/internal/cli/atlas/metrics/processes/processes_test.go b/internal/cli/metrics/processes/processes_test.go
similarity index 100%
rename from internal/cli/atlas/metrics/processes/processes_test.go
rename to internal/cli/metrics/processes/processes_test.go
diff --git a/internal/cli/atlas/networking/containers/containers.go b/internal/cli/networking/containers/containers.go
similarity index 100%
rename from internal/cli/atlas/networking/containers/containers.go
rename to internal/cli/networking/containers/containers.go
diff --git a/internal/cli/atlas/networking/containers/delete.go b/internal/cli/networking/containers/delete.go
similarity index 100%
rename from internal/cli/atlas/networking/containers/delete.go
rename to internal/cli/networking/containers/delete.go
diff --git a/internal/cli/atlas/networking/containers/delete_test.go b/internal/cli/networking/containers/delete_test.go
similarity index 100%
rename from internal/cli/atlas/networking/containers/delete_test.go
rename to internal/cli/networking/containers/delete_test.go
diff --git a/internal/cli/atlas/networking/containers/list.go b/internal/cli/networking/containers/list.go
similarity index 100%
rename from internal/cli/atlas/networking/containers/list.go
rename to internal/cli/networking/containers/list.go
diff --git a/internal/cli/atlas/networking/containers/list_test.go b/internal/cli/networking/containers/list_test.go
similarity index 100%
rename from internal/cli/atlas/networking/containers/list_test.go
rename to internal/cli/networking/containers/list_test.go
diff --git a/internal/cli/atlas/networking/networking.go b/internal/cli/networking/networking.go
similarity index 83%
rename from internal/cli/atlas/networking/networking.go
rename to internal/cli/networking/networking.go
index 4525974192..b3e38136a4 100644
--- a/internal/cli/atlas/networking/networking.go
+++ b/internal/cli/networking/networking.go
@@ -15,8 +15,8 @@
 package networking
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/networking/containers"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/networking/peering"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/networking/containers"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/networking/peering"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/networking/peering/create/aws.go b/internal/cli/networking/peering/create/aws.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/create/aws.go
rename to internal/cli/networking/peering/create/aws.go
diff --git a/internal/cli/atlas/networking/peering/create/aws_test.go b/internal/cli/networking/peering/create/aws_test.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/create/aws_test.go
rename to internal/cli/networking/peering/create/aws_test.go
diff --git a/internal/cli/atlas/networking/peering/create/azure.go b/internal/cli/networking/peering/create/azure.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/create/azure.go
rename to internal/cli/networking/peering/create/azure.go
diff --git a/internal/cli/atlas/networking/peering/create/azure_test.go b/internal/cli/networking/peering/create/azure_test.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/create/azure_test.go
rename to internal/cli/networking/peering/create/azure_test.go
diff --git a/internal/cli/atlas/networking/peering/create/create.go b/internal/cli/networking/peering/create/create.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/create/create.go
rename to internal/cli/networking/peering/create/create.go
diff --git a/internal/cli/atlas/networking/peering/create/gcp.go b/internal/cli/networking/peering/create/gcp.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/create/gcp.go
rename to internal/cli/networking/peering/create/gcp.go
diff --git a/internal/cli/atlas/networking/peering/create/gcp_test.go b/internal/cli/networking/peering/create/gcp_test.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/create/gcp_test.go
rename to internal/cli/networking/peering/create/gcp_test.go
diff --git a/internal/cli/atlas/networking/peering/delete.go b/internal/cli/networking/peering/delete.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/delete.go
rename to internal/cli/networking/peering/delete.go
diff --git a/internal/cli/atlas/networking/peering/delete_test.go b/internal/cli/networking/peering/delete_test.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/delete_test.go
rename to internal/cli/networking/peering/delete_test.go
diff --git a/internal/cli/atlas/networking/peering/list.go b/internal/cli/networking/peering/list.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/list.go
rename to internal/cli/networking/peering/list.go
diff --git a/internal/cli/atlas/networking/peering/list_test.go b/internal/cli/networking/peering/list_test.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/list_test.go
rename to internal/cli/networking/peering/list_test.go
diff --git a/internal/cli/atlas/networking/peering/peering.go b/internal/cli/networking/peering/peering.go
similarity index 90%
rename from internal/cli/atlas/networking/peering/peering.go
rename to internal/cli/networking/peering/peering.go
index 2fd7722a12..10cad1d26d 100644
--- a/internal/cli/atlas/networking/peering/peering.go
+++ b/internal/cli/networking/peering/peering.go
@@ -15,7 +15,7 @@
 package peering
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/networking/peering/create"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/networking/peering/create"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/networking/peering/watch.go b/internal/cli/networking/peering/watch.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/watch.go
rename to internal/cli/networking/peering/watch.go
diff --git a/internal/cli/atlas/networking/peering/watch_test.go b/internal/cli/networking/peering/watch_test.go
similarity index 100%
rename from internal/cli/atlas/networking/peering/watch_test.go
rename to internal/cli/networking/peering/watch_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/accesslists/access_lists.go b/internal/cli/organizations/apikeys/accesslists/access_lists.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/accesslists/access_lists.go
rename to internal/cli/organizations/apikeys/accesslists/access_lists.go
diff --git a/internal/cli/atlas/organizations/apikeys/accesslists/access_lists_test.go b/internal/cli/organizations/apikeys/accesslists/access_lists_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/accesslists/access_lists_test.go
rename to internal/cli/organizations/apikeys/accesslists/access_lists_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/accesslists/create.go b/internal/cli/organizations/apikeys/accesslists/create.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/accesslists/create.go
rename to internal/cli/organizations/apikeys/accesslists/create.go
diff --git a/internal/cli/atlas/organizations/apikeys/accesslists/create_test.go b/internal/cli/organizations/apikeys/accesslists/create_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/accesslists/create_test.go
rename to internal/cli/organizations/apikeys/accesslists/create_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/accesslists/delete.go b/internal/cli/organizations/apikeys/accesslists/delete.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/accesslists/delete.go
rename to internal/cli/organizations/apikeys/accesslists/delete.go
diff --git a/internal/cli/atlas/organizations/apikeys/accesslists/delete_test.go b/internal/cli/organizations/apikeys/accesslists/delete_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/accesslists/delete_test.go
rename to internal/cli/organizations/apikeys/accesslists/delete_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/accesslists/list.go b/internal/cli/organizations/apikeys/accesslists/list.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/accesslists/list.go
rename to internal/cli/organizations/apikeys/accesslists/list.go
diff --git a/internal/cli/atlas/organizations/apikeys/accesslists/list_test.go b/internal/cli/organizations/apikeys/accesslists/list_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/accesslists/list_test.go
rename to internal/cli/organizations/apikeys/accesslists/list_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/apikeys.go b/internal/cli/organizations/apikeys/apikeys.go
similarity index 91%
rename from internal/cli/atlas/organizations/apikeys/apikeys.go
rename to internal/cli/organizations/apikeys/apikeys.go
index edfa11f32f..caa44c2cb8 100644
--- a/internal/cli/atlas/organizations/apikeys/apikeys.go
+++ b/internal/cli/organizations/apikeys/apikeys.go
@@ -16,7 +16,7 @@ package apikeys
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/organizations/apikeys/accesslists"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/organizations/apikeys/accesslists"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/organizations/apikeys/create.go b/internal/cli/organizations/apikeys/create.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/create.go
rename to internal/cli/organizations/apikeys/create.go
diff --git a/internal/cli/atlas/organizations/apikeys/create_test.go b/internal/cli/organizations/apikeys/create_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/create_test.go
rename to internal/cli/organizations/apikeys/create_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/delete.go b/internal/cli/organizations/apikeys/delete.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/delete.go
rename to internal/cli/organizations/apikeys/delete.go
diff --git a/internal/cli/atlas/organizations/apikeys/delete_test.go b/internal/cli/organizations/apikeys/delete_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/delete_test.go
rename to internal/cli/organizations/apikeys/delete_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/describe.go b/internal/cli/organizations/apikeys/describe.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/describe.go
rename to internal/cli/organizations/apikeys/describe.go
diff --git a/internal/cli/atlas/organizations/apikeys/describe_test.go b/internal/cli/organizations/apikeys/describe_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/describe_test.go
rename to internal/cli/organizations/apikeys/describe_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/list.go b/internal/cli/organizations/apikeys/list.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/list.go
rename to internal/cli/organizations/apikeys/list.go
diff --git a/internal/cli/atlas/organizations/apikeys/list_test.go b/internal/cli/organizations/apikeys/list_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/list_test.go
rename to internal/cli/organizations/apikeys/list_test.go
diff --git a/internal/cli/atlas/organizations/apikeys/update.go b/internal/cli/organizations/apikeys/update.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/update.go
rename to internal/cli/organizations/apikeys/update.go
diff --git a/internal/cli/atlas/organizations/apikeys/update_test.go b/internal/cli/organizations/apikeys/update_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/apikeys/update_test.go
rename to internal/cli/organizations/apikeys/update_test.go
diff --git a/internal/cli/atlas/organizations/create_atlas.go b/internal/cli/organizations/create_atlas.go
similarity index 100%
rename from internal/cli/atlas/organizations/create_atlas.go
rename to internal/cli/organizations/create_atlas.go
diff --git a/internal/cli/atlas/organizations/create_atlas_test.go b/internal/cli/organizations/create_atlas_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/create_atlas_test.go
rename to internal/cli/organizations/create_atlas_test.go
diff --git a/internal/cli/atlas/organizations/delete.go b/internal/cli/organizations/delete.go
similarity index 100%
rename from internal/cli/atlas/organizations/delete.go
rename to internal/cli/organizations/delete.go
diff --git a/internal/cli/atlas/organizations/delete_test.go b/internal/cli/organizations/delete_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/delete_test.go
rename to internal/cli/organizations/delete_test.go
diff --git a/internal/cli/atlas/organizations/describe.go b/internal/cli/organizations/describe.go
similarity index 100%
rename from internal/cli/atlas/organizations/describe.go
rename to internal/cli/organizations/describe.go
diff --git a/internal/cli/atlas/organizations/describe_test.go b/internal/cli/organizations/describe_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/describe_test.go
rename to internal/cli/organizations/describe_test.go
diff --git a/internal/cli/atlas/organizations/invitations/delete.go b/internal/cli/organizations/invitations/delete.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/delete.go
rename to internal/cli/organizations/invitations/delete.go
diff --git a/internal/cli/atlas/organizations/invitations/delete_test.go b/internal/cli/organizations/invitations/delete_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/delete_test.go
rename to internal/cli/organizations/invitations/delete_test.go
diff --git a/internal/cli/atlas/organizations/invitations/describe.go b/internal/cli/organizations/invitations/describe.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/describe.go
rename to internal/cli/organizations/invitations/describe.go
diff --git a/internal/cli/atlas/organizations/invitations/describe_test.go b/internal/cli/organizations/invitations/describe_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/describe_test.go
rename to internal/cli/organizations/invitations/describe_test.go
diff --git a/internal/cli/atlas/organizations/invitations/invitations.go b/internal/cli/organizations/invitations/invitations.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/invitations.go
rename to internal/cli/organizations/invitations/invitations.go
diff --git a/internal/cli/atlas/organizations/invitations/invitations_test.go b/internal/cli/organizations/invitations/invitations_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/invitations_test.go
rename to internal/cli/organizations/invitations/invitations_test.go
diff --git a/internal/cli/atlas/organizations/invitations/invite.go b/internal/cli/organizations/invitations/invite.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/invite.go
rename to internal/cli/organizations/invitations/invite.go
diff --git a/internal/cli/atlas/organizations/invitations/invite_test.go b/internal/cli/organizations/invitations/invite_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/invite_test.go
rename to internal/cli/organizations/invitations/invite_test.go
diff --git a/internal/cli/atlas/organizations/invitations/list.go b/internal/cli/organizations/invitations/list.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/list.go
rename to internal/cli/organizations/invitations/list.go
diff --git a/internal/cli/atlas/organizations/invitations/list_test.go b/internal/cli/organizations/invitations/list_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/list_test.go
rename to internal/cli/organizations/invitations/list_test.go
diff --git a/internal/cli/atlas/organizations/invitations/update.go b/internal/cli/organizations/invitations/update.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/update.go
rename to internal/cli/organizations/invitations/update.go
diff --git a/internal/cli/atlas/organizations/invitations/update_test.go b/internal/cli/organizations/invitations/update_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/invitations/update_test.go
rename to internal/cli/organizations/invitations/update_test.go
diff --git a/internal/cli/atlas/organizations/list.go b/internal/cli/organizations/list.go
similarity index 100%
rename from internal/cli/atlas/organizations/list.go
rename to internal/cli/organizations/list.go
diff --git a/internal/cli/atlas/organizations/list_test.go b/internal/cli/organizations/list_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/list_test.go
rename to internal/cli/organizations/list_test.go
diff --git a/internal/cli/atlas/organizations/organizations.go b/internal/cli/organizations/organizations.go
similarity index 81%
rename from internal/cli/atlas/organizations/organizations.go
rename to internal/cli/organizations/organizations.go
index 2f1d046d63..4b1f3d930f 100644
--- a/internal/cli/atlas/organizations/organizations.go
+++ b/internal/cli/organizations/organizations.go
@@ -16,9 +16,9 @@ package organizations
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/organizations/apikeys"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/organizations/invitations"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/organizations/users"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/organizations/apikeys"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/organizations/invitations"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/organizations/users"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/organizations/organizations_test.go b/internal/cli/organizations/organizations_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/organizations_test.go
rename to internal/cli/organizations/organizations_test.go
diff --git a/internal/cli/atlas/organizations/users/list.go b/internal/cli/organizations/users/list.go
similarity index 100%
rename from internal/cli/atlas/organizations/users/list.go
rename to internal/cli/organizations/users/list.go
diff --git a/internal/cli/atlas/organizations/users/list_test.go b/internal/cli/organizations/users/list_test.go
similarity index 100%
rename from internal/cli/atlas/organizations/users/list_test.go
rename to internal/cli/organizations/users/list_test.go
diff --git a/internal/cli/atlas/performanceadvisor/namespaces/list.go b/internal/cli/performanceadvisor/namespaces/list.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/namespaces/list.go
rename to internal/cli/performanceadvisor/namespaces/list.go
diff --git a/internal/cli/atlas/performanceadvisor/namespaces/list_test.go b/internal/cli/performanceadvisor/namespaces/list_test.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/namespaces/list_test.go
rename to internal/cli/performanceadvisor/namespaces/list_test.go
diff --git a/internal/cli/atlas/performanceadvisor/performance_advisor.go b/internal/cli/performanceadvisor/performance_advisor.go
similarity index 72%
rename from internal/cli/atlas/performanceadvisor/performance_advisor.go
rename to internal/cli/performanceadvisor/performance_advisor.go
index d3f3519912..85a37ae86b 100644
--- a/internal/cli/atlas/performanceadvisor/performance_advisor.go
+++ b/internal/cli/performanceadvisor/performance_advisor.go
@@ -16,10 +16,10 @@ package performanceadvisor
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/performanceadvisor/namespaces"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/performanceadvisor/slowoperationthreshold"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/performanceadvisor/slowquerylogs"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/performanceadvisor/suggestedindexes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/performanceadvisor/namespaces"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/performanceadvisor/slowoperationthreshold"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/performanceadvisor/slowquerylogs"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/performanceadvisor/suggestedindexes"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/performanceadvisor/performance_advisor_test.go b/internal/cli/performanceadvisor/performance_advisor_test.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/performance_advisor_test.go
rename to internal/cli/performanceadvisor/performance_advisor_test.go
diff --git a/internal/cli/atlas/performanceadvisor/slowoperationthreshold/disable.go b/internal/cli/performanceadvisor/slowoperationthreshold/disable.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/slowoperationthreshold/disable.go
rename to internal/cli/performanceadvisor/slowoperationthreshold/disable.go
diff --git a/internal/cli/atlas/performanceadvisor/slowoperationthreshold/disable_test.go b/internal/cli/performanceadvisor/slowoperationthreshold/disable_test.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/slowoperationthreshold/disable_test.go
rename to internal/cli/performanceadvisor/slowoperationthreshold/disable_test.go
diff --git a/internal/cli/atlas/performanceadvisor/slowoperationthreshold/enable.go b/internal/cli/performanceadvisor/slowoperationthreshold/enable.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/slowoperationthreshold/enable.go
rename to internal/cli/performanceadvisor/slowoperationthreshold/enable.go
diff --git a/internal/cli/atlas/performanceadvisor/slowoperationthreshold/enable_test.go b/internal/cli/performanceadvisor/slowoperationthreshold/enable_test.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/slowoperationthreshold/enable_test.go
rename to internal/cli/performanceadvisor/slowoperationthreshold/enable_test.go
diff --git a/internal/cli/atlas/performanceadvisor/slowoperationthreshold/slow_operation_threshold.go b/internal/cli/performanceadvisor/slowoperationthreshold/slow_operation_threshold.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/slowoperationthreshold/slow_operation_threshold.go
rename to internal/cli/performanceadvisor/slowoperationthreshold/slow_operation_threshold.go
diff --git a/internal/cli/atlas/performanceadvisor/slowoperationthreshold/slow_operation_threshold_test.go b/internal/cli/performanceadvisor/slowoperationthreshold/slow_operation_threshold_test.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/slowoperationthreshold/slow_operation_threshold_test.go
rename to internal/cli/performanceadvisor/slowoperationthreshold/slow_operation_threshold_test.go
diff --git a/internal/cli/atlas/performanceadvisor/slowquerylogs/list.go b/internal/cli/performanceadvisor/slowquerylogs/list.go
similarity index 98%
rename from internal/cli/atlas/performanceadvisor/slowquerylogs/list.go
rename to internal/cli/performanceadvisor/slowquerylogs/list.go
index 98653ae6c6..6a05fe6424 100644
--- a/internal/cli/atlas/performanceadvisor/slowquerylogs/list.go
+++ b/internal/cli/performanceadvisor/slowquerylogs/list.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/processes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/processes"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/performanceadvisor/slowquerylogs/list_test.go b/internal/cli/performanceadvisor/slowquerylogs/list_test.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/slowquerylogs/list_test.go
rename to internal/cli/performanceadvisor/slowquerylogs/list_test.go
diff --git a/internal/cli/atlas/performanceadvisor/suggestedindexes/list.go b/internal/cli/performanceadvisor/suggestedindexes/list.go
similarity index 98%
rename from internal/cli/atlas/performanceadvisor/suggestedindexes/list.go
rename to internal/cli/performanceadvisor/suggestedindexes/list.go
index 4137e44d4d..02440c28ed 100644
--- a/internal/cli/atlas/performanceadvisor/suggestedindexes/list.go
+++ b/internal/cli/performanceadvisor/suggestedindexes/list.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/processes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/processes"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/performanceadvisor/suggestedindexes/list_test.go b/internal/cli/performanceadvisor/suggestedindexes/list_test.go
similarity index 100%
rename from internal/cli/atlas/performanceadvisor/suggestedindexes/list_test.go
rename to internal/cli/performanceadvisor/suggestedindexes/list_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/aws.go b/internal/cli/privateendpoints/aws/aws.go
similarity index 90%
rename from internal/cli/atlas/privateendpoints/aws/aws.go
rename to internal/cli/privateendpoints/aws/aws.go
index 685f48b44b..729006ae56 100644
--- a/internal/cli/atlas/privateendpoints/aws/aws.go
+++ b/internal/cli/privateendpoints/aws/aws.go
@@ -15,7 +15,7 @@
 package aws
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/aws/interfaces"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/aws/interfaces"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/privateendpoints/aws/aws_test.go b/internal/cli/privateendpoints/aws/aws_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/aws_test.go
rename to internal/cli/privateendpoints/aws/aws_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/create.go b/internal/cli/privateendpoints/aws/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/create.go
rename to internal/cli/privateendpoints/aws/create.go
diff --git a/internal/cli/atlas/privateendpoints/aws/create_test.go b/internal/cli/privateendpoints/aws/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/create_test.go
rename to internal/cli/privateendpoints/aws/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/delete.go b/internal/cli/privateendpoints/aws/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/delete.go
rename to internal/cli/privateendpoints/aws/delete.go
diff --git a/internal/cli/atlas/privateendpoints/aws/delete_test.go b/internal/cli/privateendpoints/aws/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/delete_test.go
rename to internal/cli/privateendpoints/aws/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/describe.go b/internal/cli/privateendpoints/aws/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/describe.go
rename to internal/cli/privateendpoints/aws/describe.go
diff --git a/internal/cli/atlas/privateendpoints/aws/describe_test.go b/internal/cli/privateendpoints/aws/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/describe_test.go
rename to internal/cli/privateendpoints/aws/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/interfaces/create.go b/internal/cli/privateendpoints/aws/interfaces/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/interfaces/create.go
rename to internal/cli/privateendpoints/aws/interfaces/create.go
diff --git a/internal/cli/atlas/privateendpoints/aws/interfaces/create_test.go b/internal/cli/privateendpoints/aws/interfaces/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/interfaces/create_test.go
rename to internal/cli/privateendpoints/aws/interfaces/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/interfaces/delete.go b/internal/cli/privateendpoints/aws/interfaces/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/interfaces/delete.go
rename to internal/cli/privateendpoints/aws/interfaces/delete.go
diff --git a/internal/cli/atlas/privateendpoints/aws/interfaces/delete_test.go b/internal/cli/privateendpoints/aws/interfaces/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/interfaces/delete_test.go
rename to internal/cli/privateendpoints/aws/interfaces/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/interfaces/describe.go b/internal/cli/privateendpoints/aws/interfaces/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/interfaces/describe.go
rename to internal/cli/privateendpoints/aws/interfaces/describe.go
diff --git a/internal/cli/atlas/privateendpoints/aws/interfaces/describe_test.go b/internal/cli/privateendpoints/aws/interfaces/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/interfaces/describe_test.go
rename to internal/cli/privateendpoints/aws/interfaces/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/interfaces/interfaces.go b/internal/cli/privateendpoints/aws/interfaces/interfaces.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/interfaces/interfaces.go
rename to internal/cli/privateendpoints/aws/interfaces/interfaces.go
diff --git a/internal/cli/atlas/privateendpoints/aws/interfaces/interfaces_test.go b/internal/cli/privateendpoints/aws/interfaces/interfaces_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/interfaces/interfaces_test.go
rename to internal/cli/privateendpoints/aws/interfaces/interfaces_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/list.go b/internal/cli/privateendpoints/aws/list.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/list.go
rename to internal/cli/privateendpoints/aws/list.go
diff --git a/internal/cli/atlas/privateendpoints/aws/list_test.go b/internal/cli/privateendpoints/aws/list_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/list_test.go
rename to internal/cli/privateendpoints/aws/list_test.go
diff --git a/internal/cli/atlas/privateendpoints/aws/watch.go b/internal/cli/privateendpoints/aws/watch.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/watch.go
rename to internal/cli/privateendpoints/aws/watch.go
diff --git a/internal/cli/atlas/privateendpoints/aws/watch_test.go b/internal/cli/privateendpoints/aws/watch_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/aws/watch_test.go
rename to internal/cli/privateendpoints/aws/watch_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/azure.go b/internal/cli/privateendpoints/azure/azure.go
similarity index 90%
rename from internal/cli/atlas/privateendpoints/azure/azure.go
rename to internal/cli/privateendpoints/azure/azure.go
index fb938659e6..238b2a6a66 100644
--- a/internal/cli/atlas/privateendpoints/azure/azure.go
+++ b/internal/cli/privateendpoints/azure/azure.go
@@ -15,7 +15,7 @@
 package azure
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/azure/interfaces"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/azure/interfaces"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/privateendpoints/azure/azure_test.go b/internal/cli/privateendpoints/azure/azure_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/azure_test.go
rename to internal/cli/privateendpoints/azure/azure_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/create.go b/internal/cli/privateendpoints/azure/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/create.go
rename to internal/cli/privateendpoints/azure/create.go
diff --git a/internal/cli/atlas/privateendpoints/azure/create_test.go b/internal/cli/privateendpoints/azure/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/create_test.go
rename to internal/cli/privateendpoints/azure/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/delete.go b/internal/cli/privateendpoints/azure/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/delete.go
rename to internal/cli/privateendpoints/azure/delete.go
diff --git a/internal/cli/atlas/privateendpoints/azure/delete_test.go b/internal/cli/privateendpoints/azure/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/delete_test.go
rename to internal/cli/privateendpoints/azure/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/describe.go b/internal/cli/privateendpoints/azure/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/describe.go
rename to internal/cli/privateendpoints/azure/describe.go
diff --git a/internal/cli/atlas/privateendpoints/azure/describe_test.go b/internal/cli/privateendpoints/azure/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/describe_test.go
rename to internal/cli/privateendpoints/azure/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/interfaces/create.go b/internal/cli/privateendpoints/azure/interfaces/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/interfaces/create.go
rename to internal/cli/privateendpoints/azure/interfaces/create.go
diff --git a/internal/cli/atlas/privateendpoints/azure/interfaces/create_test.go b/internal/cli/privateendpoints/azure/interfaces/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/interfaces/create_test.go
rename to internal/cli/privateendpoints/azure/interfaces/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/interfaces/delete.go b/internal/cli/privateendpoints/azure/interfaces/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/interfaces/delete.go
rename to internal/cli/privateendpoints/azure/interfaces/delete.go
diff --git a/internal/cli/atlas/privateendpoints/azure/interfaces/delete_test.go b/internal/cli/privateendpoints/azure/interfaces/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/interfaces/delete_test.go
rename to internal/cli/privateendpoints/azure/interfaces/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/interfaces/describe.go b/internal/cli/privateendpoints/azure/interfaces/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/interfaces/describe.go
rename to internal/cli/privateendpoints/azure/interfaces/describe.go
diff --git a/internal/cli/atlas/privateendpoints/azure/interfaces/describe_test.go b/internal/cli/privateendpoints/azure/interfaces/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/interfaces/describe_test.go
rename to internal/cli/privateendpoints/azure/interfaces/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/interfaces/interfaces.go b/internal/cli/privateendpoints/azure/interfaces/interfaces.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/interfaces/interfaces.go
rename to internal/cli/privateendpoints/azure/interfaces/interfaces.go
diff --git a/internal/cli/atlas/privateendpoints/azure/interfaces/interfaces_test.go b/internal/cli/privateendpoints/azure/interfaces/interfaces_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/interfaces/interfaces_test.go
rename to internal/cli/privateendpoints/azure/interfaces/interfaces_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/list.go b/internal/cli/privateendpoints/azure/list.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/list.go
rename to internal/cli/privateendpoints/azure/list.go
diff --git a/internal/cli/atlas/privateendpoints/azure/list_test.go b/internal/cli/privateendpoints/azure/list_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/list_test.go
rename to internal/cli/privateendpoints/azure/list_test.go
diff --git a/internal/cli/atlas/privateendpoints/azure/watch.go b/internal/cli/privateendpoints/azure/watch.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/watch.go
rename to internal/cli/privateendpoints/azure/watch.go
diff --git a/internal/cli/atlas/privateendpoints/azure/watch_test.go b/internal/cli/privateendpoints/azure/watch_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/azure/watch_test.go
rename to internal/cli/privateendpoints/azure/watch_test.go
diff --git a/internal/cli/atlas/privateendpoints/create.go b/internal/cli/privateendpoints/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/create.go
rename to internal/cli/privateendpoints/create.go
diff --git a/internal/cli/atlas/privateendpoints/create_test.go b/internal/cli/privateendpoints/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/create_test.go
rename to internal/cli/privateendpoints/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/aws.go b/internal/cli/privateendpoints/datalake/aws/aws.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/aws.go
rename to internal/cli/privateendpoints/datalake/aws/aws.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/aws_test.go b/internal/cli/privateendpoints/datalake/aws/aws_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/aws_test.go
rename to internal/cli/privateendpoints/datalake/aws/aws_test.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/create.go b/internal/cli/privateendpoints/datalake/aws/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/create.go
rename to internal/cli/privateendpoints/datalake/aws/create.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/create_test.go b/internal/cli/privateendpoints/datalake/aws/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/create_test.go
rename to internal/cli/privateendpoints/datalake/aws/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/delete.go b/internal/cli/privateendpoints/datalake/aws/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/delete.go
rename to internal/cli/privateendpoints/datalake/aws/delete.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/delete_test.go b/internal/cli/privateendpoints/datalake/aws/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/delete_test.go
rename to internal/cli/privateendpoints/datalake/aws/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/describe.go b/internal/cli/privateendpoints/datalake/aws/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/describe.go
rename to internal/cli/privateendpoints/datalake/aws/describe.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/describe_test.go b/internal/cli/privateendpoints/datalake/aws/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/describe_test.go
rename to internal/cli/privateendpoints/datalake/aws/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/list.go b/internal/cli/privateendpoints/datalake/aws/list.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/list.go
rename to internal/cli/privateendpoints/datalake/aws/list.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/aws/list_test.go b/internal/cli/privateendpoints/datalake/aws/list_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/aws/list_test.go
rename to internal/cli/privateendpoints/datalake/aws/list_test.go
diff --git a/internal/cli/atlas/privateendpoints/datalake/data_lake.go b/internal/cli/privateendpoints/datalake/data_lake.go
similarity index 91%
rename from internal/cli/atlas/privateendpoints/datalake/data_lake.go
rename to internal/cli/privateendpoints/datalake/data_lake.go
index 907c988cad..0b602e27f9 100644
--- a/internal/cli/atlas/privateendpoints/datalake/data_lake.go
+++ b/internal/cli/privateendpoints/datalake/data_lake.go
@@ -16,7 +16,7 @@ package datalake
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/datalake/aws"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/datalake/aws"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/privateendpoints/datalake/data_lake_test.go b/internal/cli/privateendpoints/datalake/data_lake_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/datalake/data_lake_test.go
rename to internal/cli/privateendpoints/datalake/data_lake_test.go
diff --git a/internal/cli/atlas/privateendpoints/delete.go b/internal/cli/privateendpoints/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/delete.go
rename to internal/cli/privateendpoints/delete.go
diff --git a/internal/cli/atlas/privateendpoints/delete_test.go b/internal/cli/privateendpoints/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/delete_test.go
rename to internal/cli/privateendpoints/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/describe.go b/internal/cli/privateendpoints/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/describe.go
rename to internal/cli/privateendpoints/describe.go
diff --git a/internal/cli/atlas/privateendpoints/describe_test.go b/internal/cli/privateendpoints/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/describe_test.go
rename to internal/cli/privateendpoints/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/create.go b/internal/cli/privateendpoints/gcp/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/create.go
rename to internal/cli/privateendpoints/gcp/create.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/create_test.go b/internal/cli/privateendpoints/gcp/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/create_test.go
rename to internal/cli/privateendpoints/gcp/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/delete.go b/internal/cli/privateendpoints/gcp/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/delete.go
rename to internal/cli/privateendpoints/gcp/delete.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/delete_test.go b/internal/cli/privateendpoints/gcp/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/delete_test.go
rename to internal/cli/privateendpoints/gcp/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/describe.go b/internal/cli/privateendpoints/gcp/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/describe.go
rename to internal/cli/privateendpoints/gcp/describe.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/describe_test.go b/internal/cli/privateendpoints/gcp/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/describe_test.go
rename to internal/cli/privateendpoints/gcp/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/gcp.go b/internal/cli/privateendpoints/gcp/gcp.go
similarity index 90%
rename from internal/cli/atlas/privateendpoints/gcp/gcp.go
rename to internal/cli/privateendpoints/gcp/gcp.go
index 13df7f5f18..87646898d0 100644
--- a/internal/cli/atlas/privateendpoints/gcp/gcp.go
+++ b/internal/cli/privateendpoints/gcp/gcp.go
@@ -15,7 +15,7 @@
 package gcp
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/gcp/interfaces"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/gcp/interfaces"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/privateendpoints/gcp/gcp_test.go b/internal/cli/privateendpoints/gcp/gcp_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/gcp_test.go
rename to internal/cli/privateendpoints/gcp/gcp_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/interfaces/create.go b/internal/cli/privateendpoints/gcp/interfaces/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/interfaces/create.go
rename to internal/cli/privateendpoints/gcp/interfaces/create.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/interfaces/create_test.go b/internal/cli/privateendpoints/gcp/interfaces/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/interfaces/create_test.go
rename to internal/cli/privateendpoints/gcp/interfaces/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/interfaces/delete.go b/internal/cli/privateendpoints/gcp/interfaces/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/interfaces/delete.go
rename to internal/cli/privateendpoints/gcp/interfaces/delete.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/interfaces/delete_test.go b/internal/cli/privateendpoints/gcp/interfaces/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/interfaces/delete_test.go
rename to internal/cli/privateendpoints/gcp/interfaces/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/interfaces/describe.go b/internal/cli/privateendpoints/gcp/interfaces/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/interfaces/describe.go
rename to internal/cli/privateendpoints/gcp/interfaces/describe.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/interfaces/describe_test.go b/internal/cli/privateendpoints/gcp/interfaces/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/interfaces/describe_test.go
rename to internal/cli/privateendpoints/gcp/interfaces/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/interfaces/interfaces.go b/internal/cli/privateendpoints/gcp/interfaces/interfaces.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/interfaces/interfaces.go
rename to internal/cli/privateendpoints/gcp/interfaces/interfaces.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/interfaces/interfaces_test.go b/internal/cli/privateendpoints/gcp/interfaces/interfaces_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/interfaces/interfaces_test.go
rename to internal/cli/privateendpoints/gcp/interfaces/interfaces_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/list.go b/internal/cli/privateendpoints/gcp/list.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/list.go
rename to internal/cli/privateendpoints/gcp/list.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/list_test.go b/internal/cli/privateendpoints/gcp/list_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/list_test.go
rename to internal/cli/privateendpoints/gcp/list_test.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/watch.go b/internal/cli/privateendpoints/gcp/watch.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/watch.go
rename to internal/cli/privateendpoints/gcp/watch.go
diff --git a/internal/cli/atlas/privateendpoints/gcp/watch_test.go b/internal/cli/privateendpoints/gcp/watch_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/gcp/watch_test.go
rename to internal/cli/privateendpoints/gcp/watch_test.go
diff --git a/internal/cli/atlas/privateendpoints/interfaces/create.go b/internal/cli/privateendpoints/interfaces/create.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/interfaces/create.go
rename to internal/cli/privateendpoints/interfaces/create.go
diff --git a/internal/cli/atlas/privateendpoints/interfaces/create_test.go b/internal/cli/privateendpoints/interfaces/create_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/interfaces/create_test.go
rename to internal/cli/privateendpoints/interfaces/create_test.go
diff --git a/internal/cli/atlas/privateendpoints/interfaces/delete.go b/internal/cli/privateendpoints/interfaces/delete.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/interfaces/delete.go
rename to internal/cli/privateendpoints/interfaces/delete.go
diff --git a/internal/cli/atlas/privateendpoints/interfaces/delete_test.go b/internal/cli/privateendpoints/interfaces/delete_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/interfaces/delete_test.go
rename to internal/cli/privateendpoints/interfaces/delete_test.go
diff --git a/internal/cli/atlas/privateendpoints/interfaces/describe.go b/internal/cli/privateendpoints/interfaces/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/interfaces/describe.go
rename to internal/cli/privateendpoints/interfaces/describe.go
diff --git a/internal/cli/atlas/privateendpoints/interfaces/describe_test.go b/internal/cli/privateendpoints/interfaces/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/interfaces/describe_test.go
rename to internal/cli/privateendpoints/interfaces/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/interfaces/interfaces.go b/internal/cli/privateendpoints/interfaces/interfaces.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/interfaces/interfaces.go
rename to internal/cli/privateendpoints/interfaces/interfaces.go
diff --git a/internal/cli/atlas/privateendpoints/list.go b/internal/cli/privateendpoints/list.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/list.go
rename to internal/cli/privateendpoints/list.go
diff --git a/internal/cli/atlas/privateendpoints/list_test.go b/internal/cli/privateendpoints/list_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/list_test.go
rename to internal/cli/privateendpoints/list_test.go
diff --git a/internal/cli/atlas/privateendpoints/onlinearchive/online_archive.go b/internal/cli/privateendpoints/onlinearchive/online_archive.go
similarity index 91%
rename from internal/cli/atlas/privateendpoints/onlinearchive/online_archive.go
rename to internal/cli/privateendpoints/onlinearchive/online_archive.go
index cb434cf570..3d8d9b9371 100644
--- a/internal/cli/atlas/privateendpoints/onlinearchive/online_archive.go
+++ b/internal/cli/privateendpoints/onlinearchive/online_archive.go
@@ -16,7 +16,7 @@ package onlinearchive
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/datalake/aws"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/datalake/aws"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/privateendpoints/onlinearchive/online_archive_test.go b/internal/cli/privateendpoints/onlinearchive/online_archive_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/onlinearchive/online_archive_test.go
rename to internal/cli/privateendpoints/onlinearchive/online_archive_test.go
diff --git a/internal/cli/atlas/privateendpoints/private_endpoint_test.go b/internal/cli/privateendpoints/private_endpoint_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/private_endpoint_test.go
rename to internal/cli/privateendpoints/private_endpoint_test.go
diff --git a/internal/cli/atlas/privateendpoints/private_endpoints.go b/internal/cli/privateendpoints/private_endpoints.go
similarity index 64%
rename from internal/cli/atlas/privateendpoints/private_endpoints.go
rename to internal/cli/privateendpoints/private_endpoints.go
index 43090ded28..ebc666082a 100644
--- a/internal/cli/atlas/privateendpoints/private_endpoints.go
+++ b/internal/cli/privateendpoints/private_endpoints.go
@@ -16,13 +16,13 @@ package privateendpoints
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/aws"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/azure"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/datalake"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/gcp"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/interfaces"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/onlinearchive"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints/regionalmodes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/aws"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/azure"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/datalake"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/gcp"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/interfaces"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/onlinearchive"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints/regionalmodes"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/privateendpoints/regionalmodes/describe.go b/internal/cli/privateendpoints/regionalmodes/describe.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/regionalmodes/describe.go
rename to internal/cli/privateendpoints/regionalmodes/describe.go
diff --git a/internal/cli/atlas/privateendpoints/regionalmodes/describe_test.go b/internal/cli/privateendpoints/regionalmodes/describe_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/regionalmodes/describe_test.go
rename to internal/cli/privateendpoints/regionalmodes/describe_test.go
diff --git a/internal/cli/atlas/privateendpoints/regionalmodes/disable.go b/internal/cli/privateendpoints/regionalmodes/disable.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/regionalmodes/disable.go
rename to internal/cli/privateendpoints/regionalmodes/disable.go
diff --git a/internal/cli/atlas/privateendpoints/regionalmodes/disable_test.go b/internal/cli/privateendpoints/regionalmodes/disable_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/regionalmodes/disable_test.go
rename to internal/cli/privateendpoints/regionalmodes/disable_test.go
diff --git a/internal/cli/atlas/privateendpoints/regionalmodes/enable.go b/internal/cli/privateendpoints/regionalmodes/enable.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/regionalmodes/enable.go
rename to internal/cli/privateendpoints/regionalmodes/enable.go
diff --git a/internal/cli/atlas/privateendpoints/regionalmodes/enable_test.go b/internal/cli/privateendpoints/regionalmodes/enable_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/regionalmodes/enable_test.go
rename to internal/cli/privateendpoints/regionalmodes/enable_test.go
diff --git a/internal/cli/atlas/privateendpoints/regionalmodes/regional_mode.go b/internal/cli/privateendpoints/regionalmodes/regional_mode.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/regionalmodes/regional_mode.go
rename to internal/cli/privateendpoints/regionalmodes/regional_mode.go
diff --git a/internal/cli/atlas/privateendpoints/regionalmodes/regional_mode_test.go b/internal/cli/privateendpoints/regionalmodes/regional_mode_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/regionalmodes/regional_mode_test.go
rename to internal/cli/privateendpoints/regionalmodes/regional_mode_test.go
diff --git a/internal/cli/atlas/privateendpoints/watch.go b/internal/cli/privateendpoints/watch.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/watch.go
rename to internal/cli/privateendpoints/watch.go
diff --git a/internal/cli/atlas/privateendpoints/watch_test.go b/internal/cli/privateendpoints/watch_test.go
similarity index 100%
rename from internal/cli/atlas/privateendpoints/watch_test.go
rename to internal/cli/privateendpoints/watch_test.go
diff --git a/internal/cli/atlas/processes/describe.go b/internal/cli/processes/describe.go
similarity index 100%
rename from internal/cli/atlas/processes/describe.go
rename to internal/cli/processes/describe.go
diff --git a/internal/cli/atlas/processes/describe_test.go b/internal/cli/processes/describe_test.go
similarity index 100%
rename from internal/cli/atlas/processes/describe_test.go
rename to internal/cli/processes/describe_test.go
diff --git a/internal/cli/atlas/processes/list.go b/internal/cli/processes/list.go
similarity index 100%
rename from internal/cli/atlas/processes/list.go
rename to internal/cli/processes/list.go
diff --git a/internal/cli/atlas/processes/list_test.go b/internal/cli/processes/list_test.go
similarity index 100%
rename from internal/cli/atlas/processes/list_test.go
rename to internal/cli/processes/list_test.go
diff --git a/internal/cli/atlas/processes/process_autocomplete.go b/internal/cli/processes/process_autocomplete.go
similarity index 100%
rename from internal/cli/atlas/processes/process_autocomplete.go
rename to internal/cli/processes/process_autocomplete.go
diff --git a/internal/cli/atlas/processes/process_autocomplete_test.go b/internal/cli/processes/process_autocomplete_test.go
similarity index 100%
rename from internal/cli/atlas/processes/process_autocomplete_test.go
rename to internal/cli/processes/process_autocomplete_test.go
diff --git a/internal/cli/atlas/processes/processes.go b/internal/cli/processes/processes.go
similarity index 100%
rename from internal/cli/atlas/processes/processes.go
rename to internal/cli/processes/processes.go
diff --git a/internal/cli/atlas/processes/processes_test.go b/internal/cli/processes/processes_test.go
similarity index 100%
rename from internal/cli/atlas/processes/processes_test.go
rename to internal/cli/processes/processes_test.go
diff --git a/internal/cli/atlas/projects/apikeys/api_keys.go b/internal/cli/projects/apikeys/api_keys.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/api_keys.go
rename to internal/cli/projects/apikeys/api_keys.go
diff --git a/internal/cli/atlas/projects/apikeys/assign.go b/internal/cli/projects/apikeys/assign.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/assign.go
rename to internal/cli/projects/apikeys/assign.go
diff --git a/internal/cli/atlas/projects/apikeys/assign_test.go b/internal/cli/projects/apikeys/assign_test.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/assign_test.go
rename to internal/cli/projects/apikeys/assign_test.go
diff --git a/internal/cli/atlas/projects/apikeys/create.go b/internal/cli/projects/apikeys/create.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/create.go
rename to internal/cli/projects/apikeys/create.go
diff --git a/internal/cli/atlas/projects/apikeys/create_test.go b/internal/cli/projects/apikeys/create_test.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/create_test.go
rename to internal/cli/projects/apikeys/create_test.go
diff --git a/internal/cli/atlas/projects/apikeys/delete.go b/internal/cli/projects/apikeys/delete.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/delete.go
rename to internal/cli/projects/apikeys/delete.go
diff --git a/internal/cli/atlas/projects/apikeys/delete_test.go b/internal/cli/projects/apikeys/delete_test.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/delete_test.go
rename to internal/cli/projects/apikeys/delete_test.go
diff --git a/internal/cli/atlas/projects/apikeys/list.go b/internal/cli/projects/apikeys/list.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/list.go
rename to internal/cli/projects/apikeys/list.go
diff --git a/internal/cli/atlas/projects/apikeys/list_test.go b/internal/cli/projects/apikeys/list_test.go
similarity index 100%
rename from internal/cli/atlas/projects/apikeys/list_test.go
rename to internal/cli/projects/apikeys/list_test.go
diff --git a/internal/cli/atlas/projects/create.go b/internal/cli/projects/create.go
similarity index 100%
rename from internal/cli/atlas/projects/create.go
rename to internal/cli/projects/create.go
diff --git a/internal/cli/atlas/projects/create_test.go b/internal/cli/projects/create_test.go
similarity index 100%
rename from internal/cli/atlas/projects/create_test.go
rename to internal/cli/projects/create_test.go
diff --git a/internal/cli/atlas/projects/delete.go b/internal/cli/projects/delete.go
similarity index 100%
rename from internal/cli/atlas/projects/delete.go
rename to internal/cli/projects/delete.go
diff --git a/internal/cli/atlas/projects/delete_test.go b/internal/cli/projects/delete_test.go
similarity index 100%
rename from internal/cli/atlas/projects/delete_test.go
rename to internal/cli/projects/delete_test.go
diff --git a/internal/cli/atlas/projects/describe.go b/internal/cli/projects/describe.go
similarity index 100%
rename from internal/cli/atlas/projects/describe.go
rename to internal/cli/projects/describe.go
diff --git a/internal/cli/atlas/projects/describe_test.go b/internal/cli/projects/describe_test.go
similarity index 100%
rename from internal/cli/atlas/projects/describe_test.go
rename to internal/cli/projects/describe_test.go
diff --git a/internal/cli/atlas/projects/invitations/delete.go b/internal/cli/projects/invitations/delete.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/delete.go
rename to internal/cli/projects/invitations/delete.go
diff --git a/internal/cli/atlas/projects/invitations/delete_test.go b/internal/cli/projects/invitations/delete_test.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/delete_test.go
rename to internal/cli/projects/invitations/delete_test.go
diff --git a/internal/cli/atlas/projects/invitations/describe.go b/internal/cli/projects/invitations/describe.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/describe.go
rename to internal/cli/projects/invitations/describe.go
diff --git a/internal/cli/atlas/projects/invitations/describe_test.go b/internal/cli/projects/invitations/describe_test.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/describe_test.go
rename to internal/cli/projects/invitations/describe_test.go
diff --git a/internal/cli/atlas/projects/invitations/invitations.go b/internal/cli/projects/invitations/invitations.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/invitations.go
rename to internal/cli/projects/invitations/invitations.go
diff --git a/internal/cli/atlas/projects/invitations/invitations_test.go b/internal/cli/projects/invitations/invitations_test.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/invitations_test.go
rename to internal/cli/projects/invitations/invitations_test.go
diff --git a/internal/cli/atlas/projects/invitations/invite.go b/internal/cli/projects/invitations/invite.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/invite.go
rename to internal/cli/projects/invitations/invite.go
diff --git a/internal/cli/atlas/projects/invitations/invite_test.go b/internal/cli/projects/invitations/invite_test.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/invite_test.go
rename to internal/cli/projects/invitations/invite_test.go
diff --git a/internal/cli/atlas/projects/invitations/list.go b/internal/cli/projects/invitations/list.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/list.go
rename to internal/cli/projects/invitations/list.go
diff --git a/internal/cli/atlas/projects/invitations/list_test.go b/internal/cli/projects/invitations/list_test.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/list_test.go
rename to internal/cli/projects/invitations/list_test.go
diff --git a/internal/cli/atlas/projects/invitations/update.go b/internal/cli/projects/invitations/update.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/update.go
rename to internal/cli/projects/invitations/update.go
diff --git a/internal/cli/atlas/projects/invitations/update_test.go b/internal/cli/projects/invitations/update_test.go
similarity index 100%
rename from internal/cli/atlas/projects/invitations/update_test.go
rename to internal/cli/projects/invitations/update_test.go
diff --git a/internal/cli/atlas/projects/list.go b/internal/cli/projects/list.go
similarity index 100%
rename from internal/cli/atlas/projects/list.go
rename to internal/cli/projects/list.go
diff --git a/internal/cli/atlas/projects/list_test.go b/internal/cli/projects/list_test.go
similarity index 100%
rename from internal/cli/atlas/projects/list_test.go
rename to internal/cli/projects/list_test.go
diff --git a/internal/cli/atlas/projects/projects.go b/internal/cli/projects/projects.go
similarity index 73%
rename from internal/cli/atlas/projects/projects.go
rename to internal/cli/projects/projects.go
index aecd75bfd9..e8430c2a4c 100644
--- a/internal/cli/atlas/projects/projects.go
+++ b/internal/cli/projects/projects.go
@@ -16,11 +16,11 @@ package projects
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/projects/apikeys"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/projects/invitations"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/projects/settings"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/projects/teams"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/projects/users"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/projects/apikeys"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/projects/invitations"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/projects/settings"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/projects/teams"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/projects/users"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/projects/projects_test.go b/internal/cli/projects/projects_test.go
similarity index 100%
rename from internal/cli/atlas/projects/projects_test.go
rename to internal/cli/projects/projects_test.go
diff --git a/internal/cli/atlas/projects/settings/describe.go b/internal/cli/projects/settings/describe.go
similarity index 100%
rename from internal/cli/atlas/projects/settings/describe.go
rename to internal/cli/projects/settings/describe.go
diff --git a/internal/cli/atlas/projects/settings/describe_test.go b/internal/cli/projects/settings/describe_test.go
similarity index 100%
rename from internal/cli/atlas/projects/settings/describe_test.go
rename to internal/cli/projects/settings/describe_test.go
diff --git a/internal/cli/atlas/projects/settings/settings.go b/internal/cli/projects/settings/settings.go
similarity index 100%
rename from internal/cli/atlas/projects/settings/settings.go
rename to internal/cli/projects/settings/settings.go
diff --git a/internal/cli/atlas/projects/settings/settings_test.go b/internal/cli/projects/settings/settings_test.go
similarity index 100%
rename from internal/cli/atlas/projects/settings/settings_test.go
rename to internal/cli/projects/settings/settings_test.go
diff --git a/internal/cli/atlas/projects/settings/update.go b/internal/cli/projects/settings/update.go
similarity index 100%
rename from internal/cli/atlas/projects/settings/update.go
rename to internal/cli/projects/settings/update.go
diff --git a/internal/cli/atlas/projects/settings/update_test.go b/internal/cli/projects/settings/update_test.go
similarity index 100%
rename from internal/cli/atlas/projects/settings/update_test.go
rename to internal/cli/projects/settings/update_test.go
diff --git a/internal/cli/atlas/projects/teams/add.go b/internal/cli/projects/teams/add.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/add.go
rename to internal/cli/projects/teams/add.go
diff --git a/internal/cli/atlas/projects/teams/add_test.go b/internal/cli/projects/teams/add_test.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/add_test.go
rename to internal/cli/projects/teams/add_test.go
diff --git a/internal/cli/atlas/projects/teams/delete.go b/internal/cli/projects/teams/delete.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/delete.go
rename to internal/cli/projects/teams/delete.go
diff --git a/internal/cli/atlas/projects/teams/delete_test.go b/internal/cli/projects/teams/delete_test.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/delete_test.go
rename to internal/cli/projects/teams/delete_test.go
diff --git a/internal/cli/atlas/projects/teams/list.go b/internal/cli/projects/teams/list.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/list.go
rename to internal/cli/projects/teams/list.go
diff --git a/internal/cli/atlas/projects/teams/list_test.go b/internal/cli/projects/teams/list_test.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/list_test.go
rename to internal/cli/projects/teams/list_test.go
diff --git a/internal/cli/atlas/projects/teams/teams.go b/internal/cli/projects/teams/teams.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/teams.go
rename to internal/cli/projects/teams/teams.go
diff --git a/internal/cli/atlas/projects/teams/update.go b/internal/cli/projects/teams/update.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/update.go
rename to internal/cli/projects/teams/update.go
diff --git a/internal/cli/atlas/projects/teams/update_test.go b/internal/cli/projects/teams/update_test.go
similarity index 100%
rename from internal/cli/atlas/projects/teams/update_test.go
rename to internal/cli/projects/teams/update_test.go
diff --git a/internal/cli/atlas/projects/users/delete.go b/internal/cli/projects/users/delete.go
similarity index 100%
rename from internal/cli/atlas/projects/users/delete.go
rename to internal/cli/projects/users/delete.go
diff --git a/internal/cli/atlas/projects/users/delete_test.go b/internal/cli/projects/users/delete_test.go
similarity index 100%
rename from internal/cli/atlas/projects/users/delete_test.go
rename to internal/cli/projects/users/delete_test.go
diff --git a/internal/cli/atlas/projects/users/list.go b/internal/cli/projects/users/list.go
similarity index 100%
rename from internal/cli/atlas/projects/users/list.go
rename to internal/cli/projects/users/list.go
diff --git a/internal/cli/atlas/projects/users/list_test.go b/internal/cli/projects/users/list_test.go
similarity index 100%
rename from internal/cli/atlas/projects/users/list_test.go
rename to internal/cli/projects/users/list_test.go
diff --git a/internal/cli/atlas/projects/users/users.go b/internal/cli/projects/users/users.go
similarity index 100%
rename from internal/cli/atlas/projects/users/users.go
rename to internal/cli/projects/users/users.go
diff --git a/internal/cli/root/atlas/builder.go b/internal/cli/root/builder.go
similarity index 78%
rename from internal/cli/root/atlas/builder.go
rename to internal/cli/root/builder.go
index aed08f3419..57d4891928 100644
--- a/internal/cli/root/atlas/builder.go
+++ b/internal/cli/root/builder.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package atlas
+package root
 
 import (
 	"errors"
@@ -25,41 +25,41 @@ import (
 	"time"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/accesslists"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/accesslogs"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/alerts"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/auditing"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/cloudproviders"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/customdbroles"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/customdns"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datafederation"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datalake"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datalakepipelines"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/dbusers"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/events"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/integrations"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/kubernetes"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/livemigrations"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/logs"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/maintenance"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/metrics"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/networking"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/organizations"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/performanceadvisor"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/privateendpoints"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/processes"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/projects"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/security"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/serverless"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/setup"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/streams"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/teams"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/users"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/accesslists"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/accesslogs"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/alerts"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/auditing"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/auth"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/cloudproviders"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters"
 	cliconfig "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/config"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/customdbroles"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/customdns"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datafederation"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datalake"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datalakepipelines"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/dbusers"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/events"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/integrations"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/kubernetes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/livemigrations"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/logs"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/maintenance"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/metrics"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/networking"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/organizations"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/performanceadvisor"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/privateendpoints"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/processes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/projects"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/security"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/serverless"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/setup"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/streams"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/teams"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/users"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/homebrew"
diff --git a/internal/cli/root/atlas/builder_test.go b/internal/cli/root/builder_test.go
similarity index 99%
rename from internal/cli/root/atlas/builder_test.go
rename to internal/cli/root/builder_test.go
index 51fb1795ab..4479212c18 100644
--- a/internal/cli/root/atlas/builder_test.go
+++ b/internal/cli/root/builder_test.go
@@ -14,7 +14,7 @@
 
 //go:build unit
 
-package atlas
+package root
 
 import (
 	"bytes"
diff --git a/internal/cli/atlas/search/create.go b/internal/cli/search/create.go
similarity index 100%
rename from internal/cli/atlas/search/create.go
rename to internal/cli/search/create.go
diff --git a/internal/cli/atlas/search/create_test.go b/internal/cli/search/create_test.go
similarity index 100%
rename from internal/cli/atlas/search/create_test.go
rename to internal/cli/search/create_test.go
diff --git a/internal/cli/atlas/search/delete.go b/internal/cli/search/delete.go
similarity index 100%
rename from internal/cli/atlas/search/delete.go
rename to internal/cli/search/delete.go
diff --git a/internal/cli/atlas/search/delete_test.go b/internal/cli/search/delete_test.go
similarity index 100%
rename from internal/cli/atlas/search/delete_test.go
rename to internal/cli/search/delete_test.go
diff --git a/internal/cli/atlas/search/describe.go b/internal/cli/search/describe.go
similarity index 100%
rename from internal/cli/atlas/search/describe.go
rename to internal/cli/search/describe.go
diff --git a/internal/cli/atlas/search/describe_test.go b/internal/cli/search/describe_test.go
similarity index 100%
rename from internal/cli/atlas/search/describe_test.go
rename to internal/cli/search/describe_test.go
diff --git a/internal/cli/atlas/search/index_opts.go b/internal/cli/search/index_opts.go
similarity index 100%
rename from internal/cli/atlas/search/index_opts.go
rename to internal/cli/search/index_opts.go
diff --git a/internal/cli/atlas/search/indexes.go b/internal/cli/search/indexes.go
similarity index 100%
rename from internal/cli/atlas/search/indexes.go
rename to internal/cli/search/indexes.go
diff --git a/internal/cli/atlas/search/list.go b/internal/cli/search/list.go
similarity index 100%
rename from internal/cli/atlas/search/list.go
rename to internal/cli/search/list.go
diff --git a/internal/cli/atlas/search/list_test.go b/internal/cli/search/list_test.go
similarity index 100%
rename from internal/cli/atlas/search/list_test.go
rename to internal/cli/search/list_test.go
diff --git a/internal/cli/atlas/search/nodes/create.go b/internal/cli/search/nodes/create.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/create.go
rename to internal/cli/search/nodes/create.go
diff --git a/internal/cli/atlas/search/nodes/create_test.go b/internal/cli/search/nodes/create_test.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/create_test.go
rename to internal/cli/search/nodes/create_test.go
diff --git a/internal/cli/atlas/search/nodes/delete.go b/internal/cli/search/nodes/delete.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/delete.go
rename to internal/cli/search/nodes/delete.go
diff --git a/internal/cli/atlas/search/nodes/delete_test.go b/internal/cli/search/nodes/delete_test.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/delete_test.go
rename to internal/cli/search/nodes/delete_test.go
diff --git a/internal/cli/atlas/search/nodes/list.go b/internal/cli/search/nodes/list.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/list.go
rename to internal/cli/search/nodes/list.go
diff --git a/internal/cli/atlas/search/nodes/list_test.go b/internal/cli/search/nodes/list_test.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/list_test.go
rename to internal/cli/search/nodes/list_test.go
diff --git a/internal/cli/atlas/search/nodes/nodes.go b/internal/cli/search/nodes/nodes.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/nodes.go
rename to internal/cli/search/nodes/nodes.go
diff --git a/internal/cli/atlas/search/nodes/nodes_test.go b/internal/cli/search/nodes/nodes_test.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/nodes_test.go
rename to internal/cli/search/nodes/nodes_test.go
diff --git a/internal/cli/atlas/search/nodes/spec_file.go b/internal/cli/search/nodes/spec_file.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/spec_file.go
rename to internal/cli/search/nodes/spec_file.go
diff --git a/internal/cli/atlas/search/nodes/update.go b/internal/cli/search/nodes/update.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/update.go
rename to internal/cli/search/nodes/update.go
diff --git a/internal/cli/atlas/search/nodes/update_test.go b/internal/cli/search/nodes/update_test.go
similarity index 100%
rename from internal/cli/atlas/search/nodes/update_test.go
rename to internal/cli/search/nodes/update_test.go
diff --git a/internal/cli/atlas/search/search.go b/internal/cli/search/search.go
similarity index 91%
rename from internal/cli/atlas/search/search.go
rename to internal/cli/search/search.go
index a1a65735f6..b752bc8c56 100644
--- a/internal/cli/atlas/search/search.go
+++ b/internal/cli/search/search.go
@@ -15,7 +15,7 @@
 package search
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search/nodes"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search/nodes"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/search/update.go b/internal/cli/search/update.go
similarity index 100%
rename from internal/cli/atlas/search/update.go
rename to internal/cli/search/update.go
diff --git a/internal/cli/atlas/search/update_test.go b/internal/cli/search/update_test.go
similarity index 100%
rename from internal/cli/atlas/search/update_test.go
rename to internal/cli/search/update_test.go
diff --git a/internal/cli/atlas/security/customercerts/certs.go b/internal/cli/security/customercerts/certs.go
similarity index 100%
rename from internal/cli/atlas/security/customercerts/certs.go
rename to internal/cli/security/customercerts/certs.go
diff --git a/internal/cli/atlas/security/customercerts/create.go b/internal/cli/security/customercerts/create.go
similarity index 100%
rename from internal/cli/atlas/security/customercerts/create.go
rename to internal/cli/security/customercerts/create.go
diff --git a/internal/cli/atlas/security/customercerts/create_test.go b/internal/cli/security/customercerts/create_test.go
similarity index 100%
rename from internal/cli/atlas/security/customercerts/create_test.go
rename to internal/cli/security/customercerts/create_test.go
diff --git a/internal/cli/atlas/security/customercerts/describe.go b/internal/cli/security/customercerts/describe.go
similarity index 100%
rename from internal/cli/atlas/security/customercerts/describe.go
rename to internal/cli/security/customercerts/describe.go
diff --git a/internal/cli/atlas/security/customercerts/describe_test.go b/internal/cli/security/customercerts/describe_test.go
similarity index 100%
rename from internal/cli/atlas/security/customercerts/describe_test.go
rename to internal/cli/security/customercerts/describe_test.go
diff --git a/internal/cli/atlas/security/customercerts/disable.go b/internal/cli/security/customercerts/disable.go
similarity index 100%
rename from internal/cli/atlas/security/customercerts/disable.go
rename to internal/cli/security/customercerts/disable.go
diff --git a/internal/cli/atlas/security/customercerts/disable_test.go b/internal/cli/security/customercerts/disable_test.go
similarity index 100%
rename from internal/cli/atlas/security/customercerts/disable_test.go
rename to internal/cli/security/customercerts/disable_test.go
diff --git a/internal/cli/atlas/security/ldap/delete.go b/internal/cli/security/ldap/delete.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/delete.go
rename to internal/cli/security/ldap/delete.go
diff --git a/internal/cli/atlas/security/ldap/delete_test.go b/internal/cli/security/ldap/delete_test.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/delete_test.go
rename to internal/cli/security/ldap/delete_test.go
diff --git a/internal/cli/atlas/security/ldap/get.go b/internal/cli/security/ldap/get.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/get.go
rename to internal/cli/security/ldap/get.go
diff --git a/internal/cli/atlas/security/ldap/get_test.go b/internal/cli/security/ldap/get_test.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/get_test.go
rename to internal/cli/security/ldap/get_test.go
diff --git a/internal/cli/atlas/security/ldap/ldap.go b/internal/cli/security/ldap/ldap.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/ldap.go
rename to internal/cli/security/ldap/ldap.go
diff --git a/internal/cli/atlas/security/ldap/ldap_test.go b/internal/cli/security/ldap/ldap_test.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/ldap_test.go
rename to internal/cli/security/ldap/ldap_test.go
diff --git a/internal/cli/atlas/security/ldap/save.go b/internal/cli/security/ldap/save.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/save.go
rename to internal/cli/security/ldap/save.go
diff --git a/internal/cli/atlas/security/ldap/save_test.go b/internal/cli/security/ldap/save_test.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/save_test.go
rename to internal/cli/security/ldap/save_test.go
diff --git a/internal/cli/atlas/security/ldap/status.go b/internal/cli/security/ldap/status.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/status.go
rename to internal/cli/security/ldap/status.go
diff --git a/internal/cli/atlas/security/ldap/status_test.go b/internal/cli/security/ldap/status_test.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/status_test.go
rename to internal/cli/security/ldap/status_test.go
diff --git a/internal/cli/atlas/security/ldap/verify.go b/internal/cli/security/ldap/verify.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/verify.go
rename to internal/cli/security/ldap/verify.go
diff --git a/internal/cli/atlas/security/ldap/verify_test.go b/internal/cli/security/ldap/verify_test.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/verify_test.go
rename to internal/cli/security/ldap/verify_test.go
diff --git a/internal/cli/atlas/security/ldap/watch.go b/internal/cli/security/ldap/watch.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/watch.go
rename to internal/cli/security/ldap/watch.go
diff --git a/internal/cli/atlas/security/ldap/watch_test.go b/internal/cli/security/ldap/watch_test.go
similarity index 100%
rename from internal/cli/atlas/security/ldap/watch_test.go
rename to internal/cli/security/ldap/watch_test.go
diff --git a/internal/cli/atlas/security/security.go b/internal/cli/security/security.go
similarity index 83%
rename from internal/cli/atlas/security/security.go
rename to internal/cli/security/security.go
index e604b84537..160540c449 100644
--- a/internal/cli/atlas/security/security.go
+++ b/internal/cli/security/security.go
@@ -15,8 +15,8 @@
 package security
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/security/customercerts"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/security/ldap"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/security/customercerts"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/security/ldap"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/security/security_test.go b/internal/cli/security/security_test.go
similarity index 100%
rename from internal/cli/atlas/security/security_test.go
rename to internal/cli/security/security_test.go
diff --git a/internal/cli/atlas/serverless/backup/backup.go b/internal/cli/serverless/backup/backup.go
similarity index 84%
rename from internal/cli/atlas/serverless/backup/backup.go
rename to internal/cli/serverless/backup/backup.go
index 2749c423a6..23f8b94cba 100644
--- a/internal/cli/atlas/serverless/backup/backup.go
+++ b/internal/cli/serverless/backup/backup.go
@@ -16,8 +16,8 @@ package backup
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/serverless/backup/restores"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/serverless/backup/snapshots"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/serverless/backup/restores"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/serverless/backup/snapshots"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/serverless/backup/backup_test.go b/internal/cli/serverless/backup/backup_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/backup_test.go
rename to internal/cli/serverless/backup/backup_test.go
diff --git a/internal/cli/atlas/serverless/backup/restores/create.go b/internal/cli/serverless/backup/restores/create.go
similarity index 98%
rename from internal/cli/atlas/serverless/backup/restores/create.go
rename to internal/cli/serverless/backup/restores/create.go
index 30d1345c71..87ec5d5029 100644
--- a/internal/cli/atlas/serverless/backup/restores/create.go
+++ b/internal/cli/serverless/backup/restores/create.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
diff --git a/internal/cli/atlas/serverless/backup/restores/create_test.go b/internal/cli/serverless/backup/restores/create_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/create_test.go
rename to internal/cli/serverless/backup/restores/create_test.go
diff --git a/internal/cli/atlas/serverless/backup/restores/describe.go b/internal/cli/serverless/backup/restores/describe.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/describe.go
rename to internal/cli/serverless/backup/restores/describe.go
diff --git a/internal/cli/atlas/serverless/backup/restores/describe_test.go b/internal/cli/serverless/backup/restores/describe_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/describe_test.go
rename to internal/cli/serverless/backup/restores/describe_test.go
diff --git a/internal/cli/atlas/serverless/backup/restores/list.go b/internal/cli/serverless/backup/restores/list.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/list.go
rename to internal/cli/serverless/backup/restores/list.go
diff --git a/internal/cli/atlas/serverless/backup/restores/list_test.go b/internal/cli/serverless/backup/restores/list_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/list_test.go
rename to internal/cli/serverless/backup/restores/list_test.go
diff --git a/internal/cli/atlas/serverless/backup/restores/restores.go b/internal/cli/serverless/backup/restores/restores.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/restores.go
rename to internal/cli/serverless/backup/restores/restores.go
diff --git a/internal/cli/atlas/serverless/backup/restores/restores_test.go b/internal/cli/serverless/backup/restores/restores_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/restores_test.go
rename to internal/cli/serverless/backup/restores/restores_test.go
diff --git a/internal/cli/atlas/serverless/backup/restores/watch.go b/internal/cli/serverless/backup/restores/watch.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/watch.go
rename to internal/cli/serverless/backup/restores/watch.go
diff --git a/internal/cli/atlas/serverless/backup/restores/watch_test.go b/internal/cli/serverless/backup/restores/watch_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/restores/watch_test.go
rename to internal/cli/serverless/backup/restores/watch_test.go
diff --git a/internal/cli/atlas/serverless/backup/snapshots/describe.go b/internal/cli/serverless/backup/snapshots/describe.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/snapshots/describe.go
rename to internal/cli/serverless/backup/snapshots/describe.go
diff --git a/internal/cli/atlas/serverless/backup/snapshots/describe_test.go b/internal/cli/serverless/backup/snapshots/describe_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/snapshots/describe_test.go
rename to internal/cli/serverless/backup/snapshots/describe_test.go
diff --git a/internal/cli/atlas/serverless/backup/snapshots/list.go b/internal/cli/serverless/backup/snapshots/list.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/snapshots/list.go
rename to internal/cli/serverless/backup/snapshots/list.go
diff --git a/internal/cli/atlas/serverless/backup/snapshots/list_test.go b/internal/cli/serverless/backup/snapshots/list_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/snapshots/list_test.go
rename to internal/cli/serverless/backup/snapshots/list_test.go
diff --git a/internal/cli/atlas/serverless/backup/snapshots/snapshots.go b/internal/cli/serverless/backup/snapshots/snapshots.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/snapshots/snapshots.go
rename to internal/cli/serverless/backup/snapshots/snapshots.go
diff --git a/internal/cli/atlas/serverless/backup/snapshots/snapshots_test.go b/internal/cli/serverless/backup/snapshots/snapshots_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/snapshots/snapshots_test.go
rename to internal/cli/serverless/backup/snapshots/snapshots_test.go
diff --git a/internal/cli/atlas/serverless/backup/snapshots/watch.go b/internal/cli/serverless/backup/snapshots/watch.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/snapshots/watch.go
rename to internal/cli/serverless/backup/snapshots/watch.go
diff --git a/internal/cli/atlas/serverless/backup/snapshots/watch_test.go b/internal/cli/serverless/backup/snapshots/watch_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/backup/snapshots/watch_test.go
rename to internal/cli/serverless/backup/snapshots/watch_test.go
diff --git a/internal/cli/atlas/serverless/create.go b/internal/cli/serverless/create.go
similarity index 100%
rename from internal/cli/atlas/serverless/create.go
rename to internal/cli/serverless/create.go
diff --git a/internal/cli/atlas/serverless/create_test.go b/internal/cli/serverless/create_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/create_test.go
rename to internal/cli/serverless/create_test.go
diff --git a/internal/cli/atlas/serverless/delete.go b/internal/cli/serverless/delete.go
similarity index 100%
rename from internal/cli/atlas/serverless/delete.go
rename to internal/cli/serverless/delete.go
diff --git a/internal/cli/atlas/serverless/delete_test.go b/internal/cli/serverless/delete_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/delete_test.go
rename to internal/cli/serverless/delete_test.go
diff --git a/internal/cli/atlas/serverless/describe.go b/internal/cli/serverless/describe.go
similarity index 100%
rename from internal/cli/atlas/serverless/describe.go
rename to internal/cli/serverless/describe.go
diff --git a/internal/cli/atlas/serverless/describe_test.go b/internal/cli/serverless/describe_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/describe_test.go
rename to internal/cli/serverless/describe_test.go
diff --git a/internal/cli/atlas/serverless/list.go b/internal/cli/serverless/list.go
similarity index 100%
rename from internal/cli/atlas/serverless/list.go
rename to internal/cli/serverless/list.go
diff --git a/internal/cli/atlas/serverless/list_test.go b/internal/cli/serverless/list_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/list_test.go
rename to internal/cli/serverless/list_test.go
diff --git a/internal/cli/atlas/serverless/serverless.go b/internal/cli/serverless/serverless.go
similarity index 93%
rename from internal/cli/atlas/serverless/serverless.go
rename to internal/cli/serverless/serverless.go
index f83bf5a34a..ebb90363f2 100644
--- a/internal/cli/atlas/serverless/serverless.go
+++ b/internal/cli/serverless/serverless.go
@@ -15,7 +15,7 @@
 package serverless
 
 import (
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/serverless/backup"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/serverless/backup"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/serverless/serverless_test.go b/internal/cli/serverless/serverless_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/serverless_test.go
rename to internal/cli/serverless/serverless_test.go
diff --git a/internal/cli/atlas/serverless/update.go b/internal/cli/serverless/update.go
similarity index 100%
rename from internal/cli/atlas/serverless/update.go
rename to internal/cli/serverless/update.go
diff --git a/internal/cli/atlas/serverless/update_test.go b/internal/cli/serverless/update_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/update_test.go
rename to internal/cli/serverless/update_test.go
diff --git a/internal/cli/atlas/serverless/watch.go b/internal/cli/serverless/watch.go
similarity index 100%
rename from internal/cli/atlas/serverless/watch.go
rename to internal/cli/serverless/watch.go
diff --git a/internal/cli/atlas/serverless/watch_test.go b/internal/cli/serverless/watch_test.go
similarity index 100%
rename from internal/cli/atlas/serverless/watch_test.go
rename to internal/cli/serverless/watch_test.go
diff --git a/internal/cli/atlas/setup/access_list_setup.go b/internal/cli/setup/access_list_setup.go
similarity index 100%
rename from internal/cli/atlas/setup/access_list_setup.go
rename to internal/cli/setup/access_list_setup.go
diff --git a/internal/cli/atlas/setup/cluster_setup.go b/internal/cli/setup/cluster_setup.go
similarity index 100%
rename from internal/cli/atlas/setup/cluster_setup.go
rename to internal/cli/setup/cluster_setup.go
diff --git a/internal/cli/atlas/setup/confirm_cluster_setup.go b/internal/cli/setup/confirm_cluster_setup.go
similarity index 100%
rename from internal/cli/atlas/setup/confirm_cluster_setup.go
rename to internal/cli/setup/confirm_cluster_setup.go
diff --git a/internal/cli/atlas/setup/confirm_default_setup.go b/internal/cli/setup/confirm_default_setup.go
similarity index 100%
rename from internal/cli/atlas/setup/confirm_default_setup.go
rename to internal/cli/setup/confirm_default_setup.go
diff --git a/internal/cli/atlas/setup/dbuser_setup.go b/internal/cli/setup/dbuser_setup.go
similarity index 100%
rename from internal/cli/atlas/setup/dbuser_setup.go
rename to internal/cli/setup/dbuser_setup.go
diff --git a/internal/cli/atlas/setup/prompt.go b/internal/cli/setup/prompt.go
similarity index 100%
rename from internal/cli/atlas/setup/prompt.go
rename to internal/cli/setup/prompt.go
diff --git a/internal/cli/atlas/setup/setup_cmd.go b/internal/cli/setup/setup_cmd.go
similarity index 99%
rename from internal/cli/atlas/setup/setup_cmd.go
rename to internal/cli/setup/setup_cmd.go
index 4cc79b6dc7..2ce09aa0d0 100644
--- a/internal/cli/atlas/setup/setup_cmd.go
+++ b/internal/cli/setup/setup_cmd.go
@@ -95,7 +95,7 @@ We could not find your public IP address. To add your IP address run:
 
 `
 
-//go:generate mockgen -destination=../../../mocks/mock_setup.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/setup ProfileReader
+//go:generate mockgen -destination=../../mocks/mock_setup.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/setup ProfileReader
 
 type ProfileReader interface {
 	ProjectID() string
diff --git a/internal/cli/atlas/setup/setup_cmd_test.go b/internal/cli/setup/setup_cmd_test.go
similarity index 100%
rename from internal/cli/atlas/setup/setup_cmd_test.go
rename to internal/cli/setup/setup_cmd_test.go
diff --git a/internal/cli/atlas/streams/connection/connection.go b/internal/cli/streams/connection/connection.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/connection.go
rename to internal/cli/streams/connection/connection.go
diff --git a/internal/cli/atlas/streams/connection/connection_test.go b/internal/cli/streams/connection/connection_test.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/connection_test.go
rename to internal/cli/streams/connection/connection_test.go
diff --git a/internal/cli/atlas/streams/connection/create.go b/internal/cli/streams/connection/create.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/create.go
rename to internal/cli/streams/connection/create.go
diff --git a/internal/cli/atlas/streams/connection/create_test.go b/internal/cli/streams/connection/create_test.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/create_test.go
rename to internal/cli/streams/connection/create_test.go
diff --git a/internal/cli/atlas/streams/connection/delete.go b/internal/cli/streams/connection/delete.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/delete.go
rename to internal/cli/streams/connection/delete.go
diff --git a/internal/cli/atlas/streams/connection/delete_test.go b/internal/cli/streams/connection/delete_test.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/delete_test.go
rename to internal/cli/streams/connection/delete_test.go
diff --git a/internal/cli/atlas/streams/connection/describe.go b/internal/cli/streams/connection/describe.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/describe.go
rename to internal/cli/streams/connection/describe.go
diff --git a/internal/cli/atlas/streams/connection/describe_test.go b/internal/cli/streams/connection/describe_test.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/describe_test.go
rename to internal/cli/streams/connection/describe_test.go
diff --git a/internal/cli/atlas/streams/connection/list.go b/internal/cli/streams/connection/list.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/list.go
rename to internal/cli/streams/connection/list.go
diff --git a/internal/cli/atlas/streams/connection/list_test.go b/internal/cli/streams/connection/list_test.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/list_test.go
rename to internal/cli/streams/connection/list_test.go
diff --git a/internal/cli/atlas/streams/connection/update.go b/internal/cli/streams/connection/update.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/update.go
rename to internal/cli/streams/connection/update.go
diff --git a/internal/cli/atlas/streams/connection/update_test.go b/internal/cli/streams/connection/update_test.go
similarity index 100%
rename from internal/cli/atlas/streams/connection/update_test.go
rename to internal/cli/streams/connection/update_test.go
diff --git a/internal/cli/atlas/streams/instance/create.go b/internal/cli/streams/instance/create.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/create.go
rename to internal/cli/streams/instance/create.go
diff --git a/internal/cli/atlas/streams/instance/create_test.go b/internal/cli/streams/instance/create_test.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/create_test.go
rename to internal/cli/streams/instance/create_test.go
diff --git a/internal/cli/atlas/streams/instance/delete.go b/internal/cli/streams/instance/delete.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/delete.go
rename to internal/cli/streams/instance/delete.go
diff --git a/internal/cli/atlas/streams/instance/delete_test.go b/internal/cli/streams/instance/delete_test.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/delete_test.go
rename to internal/cli/streams/instance/delete_test.go
diff --git a/internal/cli/atlas/streams/instance/describe.go b/internal/cli/streams/instance/describe.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/describe.go
rename to internal/cli/streams/instance/describe.go
diff --git a/internal/cli/atlas/streams/instance/describe_test.go b/internal/cli/streams/instance/describe_test.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/describe_test.go
rename to internal/cli/streams/instance/describe_test.go
diff --git a/internal/cli/atlas/streams/instance/download.go b/internal/cli/streams/instance/download.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/download.go
rename to internal/cli/streams/instance/download.go
diff --git a/internal/cli/atlas/streams/instance/download_test.go b/internal/cli/streams/instance/download_test.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/download_test.go
rename to internal/cli/streams/instance/download_test.go
diff --git a/internal/cli/atlas/streams/instance/instance.go b/internal/cli/streams/instance/instance.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/instance.go
rename to internal/cli/streams/instance/instance.go
diff --git a/internal/cli/atlas/streams/instance/instance_test.go b/internal/cli/streams/instance/instance_test.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/instance_test.go
rename to internal/cli/streams/instance/instance_test.go
diff --git a/internal/cli/atlas/streams/instance/list.go b/internal/cli/streams/instance/list.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/list.go
rename to internal/cli/streams/instance/list.go
diff --git a/internal/cli/atlas/streams/instance/list_test.go b/internal/cli/streams/instance/list_test.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/list_test.go
rename to internal/cli/streams/instance/list_test.go
diff --git a/internal/cli/atlas/streams/instance/update.go b/internal/cli/streams/instance/update.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/update.go
rename to internal/cli/streams/instance/update.go
diff --git a/internal/cli/atlas/streams/instance/update_test.go b/internal/cli/streams/instance/update_test.go
similarity index 100%
rename from internal/cli/atlas/streams/instance/update_test.go
rename to internal/cli/streams/instance/update_test.go
diff --git a/internal/cli/atlas/streams/streams.go b/internal/cli/streams/streams.go
similarity index 87%
rename from internal/cli/atlas/streams/streams.go
rename to internal/cli/streams/streams.go
index 450dce036b..e33e5093ae 100644
--- a/internal/cli/atlas/streams/streams.go
+++ b/internal/cli/streams/streams.go
@@ -16,8 +16,8 @@ package streams
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/streams/connection"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/streams/instance"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/streams/connection"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/streams/instance"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/streams/streams_test.go b/internal/cli/streams/streams_test.go
similarity index 100%
rename from internal/cli/atlas/streams/streams_test.go
rename to internal/cli/streams/streams_test.go
diff --git a/internal/cli/atlas/teams/create.go b/internal/cli/teams/create.go
similarity index 100%
rename from internal/cli/atlas/teams/create.go
rename to internal/cli/teams/create.go
diff --git a/internal/cli/atlas/teams/create_test.go b/internal/cli/teams/create_test.go
similarity index 100%
rename from internal/cli/atlas/teams/create_test.go
rename to internal/cli/teams/create_test.go
diff --git a/internal/cli/atlas/teams/delete.go b/internal/cli/teams/delete.go
similarity index 100%
rename from internal/cli/atlas/teams/delete.go
rename to internal/cli/teams/delete.go
diff --git a/internal/cli/atlas/teams/delete_test.go b/internal/cli/teams/delete_test.go
similarity index 100%
rename from internal/cli/atlas/teams/delete_test.go
rename to internal/cli/teams/delete_test.go
diff --git a/internal/cli/atlas/teams/describe.go b/internal/cli/teams/describe.go
similarity index 100%
rename from internal/cli/atlas/teams/describe.go
rename to internal/cli/teams/describe.go
diff --git a/internal/cli/atlas/teams/describe_test.go b/internal/cli/teams/describe_test.go
similarity index 100%
rename from internal/cli/atlas/teams/describe_test.go
rename to internal/cli/teams/describe_test.go
diff --git a/internal/cli/atlas/teams/list.go b/internal/cli/teams/list.go
similarity index 100%
rename from internal/cli/atlas/teams/list.go
rename to internal/cli/teams/list.go
diff --git a/internal/cli/atlas/teams/list_test.go b/internal/cli/teams/list_test.go
similarity index 100%
rename from internal/cli/atlas/teams/list_test.go
rename to internal/cli/teams/list_test.go
diff --git a/internal/cli/atlas/teams/rename.go b/internal/cli/teams/rename.go
similarity index 100%
rename from internal/cli/atlas/teams/rename.go
rename to internal/cli/teams/rename.go
diff --git a/internal/cli/atlas/teams/rename_test.go b/internal/cli/teams/rename_test.go
similarity index 100%
rename from internal/cli/atlas/teams/rename_test.go
rename to internal/cli/teams/rename_test.go
diff --git a/internal/cli/atlas/teams/teams.go b/internal/cli/teams/teams.go
similarity index 93%
rename from internal/cli/atlas/teams/teams.go
rename to internal/cli/teams/teams.go
index 25dbfce762..bc6c502610 100644
--- a/internal/cli/atlas/teams/teams.go
+++ b/internal/cli/teams/teams.go
@@ -16,7 +16,7 @@ package teams
 
 import (
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/teams/users"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/teams/users"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cli/atlas/teams/users/add.go b/internal/cli/teams/users/add.go
similarity index 100%
rename from internal/cli/atlas/teams/users/add.go
rename to internal/cli/teams/users/add.go
diff --git a/internal/cli/atlas/teams/users/add_test.go b/internal/cli/teams/users/add_test.go
similarity index 100%
rename from internal/cli/atlas/teams/users/add_test.go
rename to internal/cli/teams/users/add_test.go
diff --git a/internal/cli/atlas/teams/users/delete.go b/internal/cli/teams/users/delete.go
similarity index 100%
rename from internal/cli/atlas/teams/users/delete.go
rename to internal/cli/teams/users/delete.go
diff --git a/internal/cli/atlas/teams/users/delete_test.go b/internal/cli/teams/users/delete_test.go
similarity index 100%
rename from internal/cli/atlas/teams/users/delete_test.go
rename to internal/cli/teams/users/delete_test.go
diff --git a/internal/cli/atlas/teams/users/list.go b/internal/cli/teams/users/list.go
similarity index 100%
rename from internal/cli/atlas/teams/users/list.go
rename to internal/cli/teams/users/list.go
diff --git a/internal/cli/atlas/teams/users/list_test.go b/internal/cli/teams/users/list_test.go
similarity index 100%
rename from internal/cli/atlas/teams/users/list_test.go
rename to internal/cli/teams/users/list_test.go
diff --git a/internal/cli/atlas/teams/users/users.go b/internal/cli/teams/users/users.go
similarity index 100%
rename from internal/cli/atlas/teams/users/users.go
rename to internal/cli/teams/users/users.go
diff --git a/internal/cli/atlas/users/describe.go b/internal/cli/users/describe.go
similarity index 100%
rename from internal/cli/atlas/users/describe.go
rename to internal/cli/users/describe.go
diff --git a/internal/cli/atlas/users/describe_test.go b/internal/cli/users/describe_test.go
similarity index 100%
rename from internal/cli/atlas/users/describe_test.go
rename to internal/cli/users/describe_test.go
diff --git a/internal/cli/atlas/users/invite.go b/internal/cli/users/invite.go
similarity index 100%
rename from internal/cli/atlas/users/invite.go
rename to internal/cli/users/invite.go
diff --git a/internal/cli/atlas/users/invite_test.go b/internal/cli/users/invite_test.go
similarity index 100%
rename from internal/cli/atlas/users/invite_test.go
rename to internal/cli/users/invite_test.go
diff --git a/internal/cli/atlas/users/users.go b/internal/cli/users/users.go
similarity index 100%
rename from internal/cli/atlas/users/users.go
rename to internal/cli/users/users.go
diff --git a/internal/mocks/mock_deployment_opts_telemetry.go b/internal/mocks/mock_deployment_opts_telemetry.go
index e4f1779198..a2cae0b914 100644
--- a/internal/mocks/mock_deployment_opts_telemetry.go
+++ b/internal/mocks/mock_deployment_opts_telemetry.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/deployments/options (interfaces: DeploymentTelemetry)
+// Source: github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/deployments/options (interfaces: DeploymentTelemetry)
 
 // Package mocks is a generated GoMock package.
 package mocks
diff --git a/internal/mocks/mock_setup.go b/internal/mocks/mock_setup.go
index e2e411d2e2..7475935b4b 100644
--- a/internal/mocks/mock_setup.go
+++ b/internal/mocks/mock_setup.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/setup (interfaces: ProfileReader)
+// Source: github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/setup (interfaces: ProfileReader)
 
 // Package mocks is a generated GoMock package.
 package mocks
diff --git a/test/e2e/atlas/dbusers_certs_test.go b/test/e2e/atlas/dbusers_certs_test.go
index 47fa57d0a8..3e80a6cb6e 100644
--- a/test/e2e/atlas/dbusers_certs_test.go
+++ b/test/e2e/atlas/dbusers_certs_test.go
@@ -22,7 +22,7 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/dbusers"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/dbusers"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/test/e2e"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/tools/docs/main.go b/tools/docs/main.go
index 4fb04222e7..6779617875 100644
--- a/tools/docs/main.go
+++ b/tools/docs/main.go
@@ -19,7 +19,7 @@ import (
 	"os"
 
 	"github.com/mongodb-labs/cobra2snooty"
-	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/root/atlas"
+	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/root"
 	"github.com/spf13/cobra"
 )
 
@@ -40,7 +40,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	atlasBuilder := atlas.Builder()
+	atlasBuilder := root.Builder()
 	atlasBuilder.InitDefaultCompletionCmd()
 
 	setDisableAutoGenTag(atlasBuilder)