@@ -68,7 +68,6 @@ Commands are grouped into command groups, for example, all the commands relating
 found by running the following command:
 
 ```
-stacklet-admin account --help
 Usage: stacklet-admin account [OPTIONS] COMMAND [ARGS]...
 
   Query against and Run mutations against Account objects in Stacklet.
@@ -82,34 +81,16 @@ Usage: stacklet-admin account [OPTIONS] COMMAND [ARGS]...
       $ stacklet account --output json list
 
 Options:
-  -v                           Verbosity level, increase verbosity by
-                               appending v, e.g. -vvv
-
-  --api TEXT                   If set, --cognito-user-pool-id, --cognito-
-                               client-id, --cognito-region, and --api must
-                               also be set.
-
-  --cognito-region TEXT        If set, --cognito-user-pool-id, --cognito-
-                               client-id, --cognito-region, and --api must
-                               also be set.
-
-  --cognito-client-id TEXT     If set, --cognito-user-pool-id, --cognito-
-                               client-id, --cognito-region, and --api must
-                               also be set.
-
-  --cognito-user-pool-id TEXT  If set, --cognito-user-pool-id, --cognito-
-                               client-id, --cognito-region, and --api must
-                               also be set.
-
-  --output [|plain|json|yaml]  Ouput type
-  --config TEXT
-  --help                       Show this message and exit.
+  --help  Show this message and exit.
 
 Commands:
-  add     Add an account to Stacklet
-  list    List cloud accounts in Stacklet
-  remove  Remove an account from Stacklet
-  show    Show an account in Stacklet
+  add           Add an account to Stacklet
+  list          List cloud accounts in Stacklet
+  remove        Remove an account from Stacklet
+  show          Show an account in Stacklet
+  update        Update an account in platform
+  validate      Validate an account in Stacklet
+  validate-all  Validate all accounts in Stacklet
 ```
 
 Then run the command:
 
@@ -1,27 +1,51 @@
 # Copyright Stacklet, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-import json
-import os
 import pathlib
 from urllib.parse import urlsplit, urlunsplit
 
 import click
 import jwt
 import requests
 
-from stacklet.client.platform.cognito import CognitoUserManager
-from stacklet.client.platform.commands import commands
-from stacklet.client.platform.config import StackletConfig
-from stacklet.client.platform.context import StackletContext
-from stacklet.client.platform.formatter import Formatter
-from stacklet.client.platform.utils import click_group_entry, default_options
+from .cognito import CognitoUserManager
+from .commands import commands
+from .config import DEFAULT_CONFIG_FILE, DEFAULT_OUTPUT_FORMAT, StackletConfig
+from .context import StackletContext
+from .formatter import Formatter
+from .utils import setup_logging
 
 
 @click.group()
-@default_options()
+@click.option(
+    "--config",
+    type=click.Path(path_type=pathlib.Path, dir_okay=False),
+    default=DEFAULT_CONFIG_FILE,
+    envvar="STACKLET_CONFIG",
+    show_envvar=True,
+    help="Configuration file",
+)
+@click.option(
+    "--output",
+    type=click.Choice(list(Formatter.registry.keys()), case_sensitive=False),
+    default=DEFAULT_OUTPUT_FORMAT,
+    envvar="STACKLET_OUTPUT",
+    show_envvar=True,
+    help="Output type",
+)
+@click.option(
+    "-v",
+    count=True,
+    default=0,
+    help="Verbosity level, increase verbosity by appending v, e.g. -vvv",
+)
 @click.pass_context
-def cli(*args, **kwargs):
+def cli(
+    ctx,
+    config,
+    output,
+    v,
+):
     """
     Stacklet CLI
 
@@ -30,6 +54,21 @@ def cli(*args, **kwargs):
 
         $ stacklet-admin configure
 
+    or specify the configuration parameters directly:
+
+    \b
+        $ stacklet-admin \\
+            configure \\
+            --api $stacklet_api \\
+            --cognito-client-id $cognito_client_id \\
+            --cognito-user-pool-id $cognito_user_pool_id \\
+            --region $region
+     \b
+
+    In alternative, autoconfiguration can be used by specifying the deployment URL:
+
+        $ stacklet-admin auto-configure --url https://console.myorg.stacklet.io
+
     If this is your first time using Stacklet, create a user:
 
         $ stacklet-admin user add
@@ -48,24 +87,15 @@ def cli(*args, **kwargs):
 
     To specify a different configuration file or different API endpoint/Cognito Configuration:
 
-    \b
-        $ stacklet-admin \\
-            --api $stacklet_api \\
-            --cognito-client-id $cognito_client_id \\
-            --cognito-user-pool-id $cognito_user_pool_id \\
-            --region $region \\
-            login
-
-    or:
-
     \b
         $ stacklet-admin \\
             --config $config_file_location \\
             login
+    \b
 
     Specify different output types:
 
-        $ stacklet-admin account --output json list --provider AWS
+        $ stacklet-admin --output json account list --provider AWS
 
     Stacklet queries default to 20 entries per page. To use pagiantion:
 
@@ -76,22 +106,30 @@ def cli(*args, **kwargs):
             --before $before_token \\
             --after $after_token \\
             list
+    \b
     """
-    click_group_entry(*args, **kwargs)
+    setup_logging(v)
+    ctx.obj = StackletContext(config_file=config, output_format=output)
 
 
 @cli.command(short_help="Configure stacklet-admin cli")
-@click.option("--api", prompt="Stacklet API endpoint")
-@click.option("--region", prompt="Cognito Region")
-@click.option("--cognito-client-id", prompt="Cognito User Pool Client ID")
-@click.option("--cognito-user-pool-id", prompt="Cognito User Pool ID")
-@click.option("--idp-id", prompt="(SSO) IDP ID", default="")
-@click.option("--auth-url", prompt="(SSO) Auth Url", default="")
-@click.option("--cubejs", prompt="Stacklet cube.js endpoint", default="")
-@click.option("--location", prompt="Config File Location", default="~/.stacklet/config.json")  # noqa
-@click.pass_context
+@click.option("--api", prompt="Stacklet API endpoint", help="Stacklet API endpoint")
+@click.option("--region", prompt="Cognito Region", help="Cognito Region")
+@click.option(
+    "--cognito-client-id", prompt="Cognito User Pool Client ID", help="Cognito User Pool Client ID"
+)
+@click.option("--cognito-user-pool-id", prompt="Cognito User Pool ID", help="Cognito User Pool ID")
+@click.option("--cubejs", prompt="Stacklet cube.js endpoint", help="Stacklet cube.js endpoint")
+@click.option("--idp-id", prompt="(SSO) IDP ID", default="", help="(SSO) IDP ID")
+@click.option("--auth-url", prompt="(SSO) Auth Url", default="", help="(SSO) Auth Url")
+@click.option(
+    "--location",
+    type=click.Path(path_type=pathlib.Path, dir_okay=False),
+    default=DEFAULT_CONFIG_FILE,
+    prompt="Config File Location",
+    help="Config File Location",
+)
 def configure(
-    ctx,
     api,
     region,
     cognito_client_id,
@@ -104,24 +142,18 @@ def configure(
     """
     Interactively save a Stacklet Config file
     """
-    config = {
-        "api": api,
-        "region": region,
-        "cognito_client_id": cognito_client_id,
-        "cognito_user_pool_id": cognito_user_pool_id,
-        "idp_id": idp_id,
-        "auth_url": auth_url,
-        "cubejs": cubejs,
-    }
-
-    StackletConfig.validate(config)
-
-    if not os.path.exists(location):
-        dirs = location.rsplit("/", 1)[0]
-        os.makedirs(os.path.expanduser(dirs), exist_ok=True)
-
-    with open(os.path.expanduser(location), "w+") as f:
-        f.write(json.dumps(config))
+    config = StackletConfig.from_dict(
+        {
+            "api": api,
+            "region": region,
+            "cognito_client_id": cognito_client_id,
+            "cognito_user_pool_id": cognito_user_pool_id,
+            "idp_id": idp_id,
+            "auth_url": auth_url,
+            "cubejs": cubejs,
+        }
+    )
+    config.to_file(location)
     click.echo(f"Saved config to {location}")
 
 
@@ -140,7 +172,7 @@ def configure(
 )
 @click.option(
     "--location",
-    default="~/.stacklet/config.json",
+    default=str(DEFAULT_CONFIG_FILE),
     type=click.Path(path_type=pathlib.Path, dir_okay=False),
     show_default=True,
 )
@@ -253,34 +285,28 @@ def auto_configure(url, prefix, idp, location):
     except KeyError as err:
         raise click.ClickException(f"The configuration details are missing a required key: {err}")
 
-    config_file = location.expanduser()
-    if not config_file.exists():
-        config_file.parent.mkdir(parents=True, exist_ok=True)
-
-    config_file.write_text(json.dumps(formatted_config, indent=4, sort_keys=True))
-
-    click.echo(f"Saved config to {config_file}")
+    config = StackletConfig.from_dict(formatted_config)
+    config.to_file(location)
+    click.echo(f"Saved config to {location}")
 
 
 @cli.command()
-@click.pass_context
-def show(ctx):
+@click.pass_obj
+def show(obj):
     """
     Show your config
     """
-    context = StackletContext(ctx.obj["config"], ctx.obj["raw_config"])
-    fmt = Formatter.registry.get(ctx.obj["output"])()
-    if os.path.exists(os.path.expanduser(StackletContext.DEFAULT_ID)):
-        with open(os.path.expanduser(StackletContext.DEFAULT_ID), "r") as f:
-            id_details = jwt.decode(f.read(), options={"verify_signature": False})
+    fmt = obj.formatter()
+    if id_token := obj.credentials.id_token():
+        id_details = jwt.decode(id_token, options={"verify_signature": False})
         click.echo(fmt(id_details))
         click.echo()
-    click.echo(fmt(context.config.to_json()))
+    click.echo(fmt(obj.config.to_dict()))
 
 
 @cli.command(short_help="Login to Stacklet")
-@click.option("--username", required=False)
-@click.option("--password", hide_input=True, required=False)
+@click.option("--username", help="Login username", required=False)
+@click.option("--password", help="Login password", hide_input=True, required=False)
 @click.pass_context
 def login(ctx, username, password):
     """
@@ -295,38 +321,37 @@ def login(ctx, username, password):
 
     If password is not passed in, your password will be prompted
     """
-    context = StackletContext(ctx.obj["config"], ctx.obj["raw_config"])
+    context = ctx.obj
+    config = context.config
+    can_sso_login = bool(config.auth_url)
     # sso login
-    if context.can_sso_login() and not any([username, password]):
-        from stacklet.client.platform.vendored.auth import BrowserAuthenticator
+    if can_sso_login and not any([username, password]):
+        from .vendored.auth import BrowserAuthenticator
 
         BrowserAuthenticator(
-            authority_url=context.config.auth_url,
-            client_id=context.config.cognito_client_id,
-            idp_id=context.config.idp_id,
+            authority_url=config.auth_url,
+            client_id=config.cognito_client_id,
+            idp_id=config.idp_id,
         )()
         return
-    elif not context.can_sso_login() and not any([username, password]):
+    elif not can_sso_login and not any([username, password]):
         click.echo(
             "To login with SSO ensure that your configuration includes "
             + "auth_url, and cognito_client_id values."
         )
-        raise Exception()
+        ctx.exit(1)
 
     # handle login with username/password
     if not username:
         username = click.prompt("Username")
     if not password:
         password = click.prompt("Password", hide_input=True)
     manager = CognitoUserManager.from_context(context)
-    res = manager.login(
+    id_token, access_token = manager.login(
         user=username,
         password=password,
     )
-    if not os.path.exists(os.path.dirname(os.path.expanduser(StackletContext.DEFAULT_CREDENTIALS))):
-        os.makedirs(os.path.dirname(os.path.expanduser(StackletContext.DEFAULT_CREDENTIALS)))
-    with open(os.path.expanduser(StackletContext.DEFAULT_CREDENTIALS), "w+") as f:  # noqa
-        f.write(res)
+    context.credentials.write(id_token, access_token)
 
 
 for c in commands:
 
@@ -3,30 +3,27 @@
 
 # platform client using cli
 
-from pathlib import Path
 
 import jmespath
 
 # import the commands so the registry is populated when the client is instantiated
-import stacklet.client.platform.commands  # noqa
-from stacklet.client.platform.context import StackletContext
-from stacklet.client.platform.executor import StackletGraphqlExecutor
-from stacklet.client.platform.utils import _PAGINATION_OPTIONS, get_token
+from . import commands  # noqa
+from .config import DEFAULT_CONFIG_FILE
+from .context import StackletContext
+from .executor import StackletGraphqlExecutor
+from .utils import _PAGINATION_OPTIONS
 
 
 def platform_client(pager=False, expr=False):
     # for more pythonic experience, pass expr=True to de-graphqlize the result
     # for automatic pagination handling, pass pager=True
-    if (
-        not Path(StackletContext.DEFAULT_CONFIG).expanduser().exists()
-        or not Path(StackletContext.DEFAULT_CREDENTIALS).expanduser().exists()
-    ):
+    context = StackletContext(config_file=DEFAULT_CONFIG_FILE)
+    if not DEFAULT_CONFIG_FILE.exists() or not context.credentials.api_token():
         raise ValueError("Please configure and authenticate on stacklet-admin cli")
 
     d = {}
-    ctx = StackletContext(raw_config={})
-    token = get_token()
-    executor = StackletGraphqlExecutor(ctx, token)
+
+    executor = StackletGraphqlExecutor(context)
 
     for k, snippet in StackletGraphqlExecutor.registry.items():
         # assert k == snippet.name, f"{k} mismatch {snippet.name}"