Refactor handling of CLI commands

tests/commands/test_account_org_team.py

@@ -21,7 +21,7 @@ import random
 import pytest
 import requests
 
-from platformio.commands.account import cli as cmd_account
+from platformio.account.cli import cli as cmd_account
 from platformio.commands.org import cli as cmd_org
 from platformio.commands.team import cli as cmd_team
 

tests/commands/test_lib_complex.py

@@ -17,7 +17,7 @@
 import json
 import re
 
-from platformio.commands import PlatformioCLI
+from platformio.cli import PlatformioCLI
 from platformio.commands.lib.command import cli as cmd_lib
 from platformio.package.exception import UnknownPackageError
 from platformio.util import strip_ansi_codes

tests/commands/test_test.py

@@ -21,7 +21,7 @@ import pytest
 
 from platformio import proc
 from platformio.fs import load_json
-from platformio.test.command import test_cmd as pio_test_cmd
+from platformio.test.cli import test_cmd as pio_test_cmd
 
 
 def test_calculator_example(tmp_path: Path):