diff --git a/platformio/commands/home/__init__.py b/platformio/home/__init__.py
similarity index 100%
rename from platformio/commands/home/__init__.py
rename to platformio/home/__init__.py
diff --git a/platformio/commands/home/command.py b/platformio/home/cli.py
similarity index 96%
rename from platformio/commands/home/command.py
rename to platformio/home/cli.py
index b656fc07..2d0ba1ce 100644
--- a/platformio/commands/home/command.py
+++ b/platformio/home/cli.py
@@ -16,8 +16,8 @@ import mimetypes
 
 import click
 
-from platformio.commands.home.helpers import is_port_used
-from platformio.commands.home.run import run_server
+from platformio.home.helpers import is_port_used
+from platformio.home.run import run_server
 
 
 @click.command("home", short_help="GUI to manage PlatformIO")
diff --git a/platformio/commands/home/helpers.py b/platformio/home/helpers.py
similarity index 100%
rename from platformio/commands/home/helpers.py
rename to platformio/home/helpers.py
diff --git a/platformio/commands/home/rpc/__init__.py b/platformio/home/rpc/__init__.py
similarity index 100%
rename from platformio/commands/home/rpc/__init__.py
rename to platformio/home/rpc/__init__.py
diff --git a/platformio/commands/home/rpc/handlers/__init__.py b/platformio/home/rpc/handlers/__init__.py
similarity index 100%
rename from platformio/commands/home/rpc/handlers/__init__.py
rename to platformio/home/rpc/handlers/__init__.py
diff --git a/platformio/commands/home/rpc/handlers/account.py b/platformio/home/rpc/handlers/account.py
similarity index 100%
rename from platformio/commands/home/rpc/handlers/account.py
rename to platformio/home/rpc/handlers/account.py
diff --git a/platformio/commands/home/rpc/handlers/app.py b/platformio/home/rpc/handlers/app.py
similarity index 100%
rename from platformio/commands/home/rpc/handlers/app.py
rename to platformio/home/rpc/handlers/app.py
diff --git a/platformio/commands/home/rpc/handlers/ide.py b/platformio/home/rpc/handlers/ide.py
similarity index 100%
rename from platformio/commands/home/rpc/handlers/ide.py
rename to platformio/home/rpc/handlers/ide.py
diff --git a/platformio/commands/home/rpc/handlers/misc.py b/platformio/home/rpc/handlers/misc.py
similarity index 96%
rename from platformio/commands/home/rpc/handlers/misc.py
rename to platformio/home/rpc/handlers/misc.py
index 7626456a..c384fea9 100644
--- a/platformio/commands/home/rpc/handlers/misc.py
+++ b/platformio/home/rpc/handlers/misc.py
@@ -16,8 +16,8 @@ import json
 import time
 
 from platformio.cache import ContentCache
-from platformio.commands.home.rpc.handlers.os import OSRPC
 from platformio.compat import aio_create_task
+from platformio.home.rpc.handlers.os import OSRPC
 
 
 class MiscRPC:
diff --git a/platformio/commands/home/rpc/handlers/os.py b/platformio/home/rpc/handlers/os.py
similarity index 99%
rename from platformio/commands/home/rpc/handlers/os.py
rename to platformio/home/rpc/handlers/os.py
index c6ddcaa6..1aaf6d63 100644
--- a/platformio/commands/home/rpc/handlers/os.py
+++ b/platformio/home/rpc/handlers/os.py
@@ -24,8 +24,8 @@ import click
 
 from platformio import __default_requests_timeout__, fs
 from platformio.cache import ContentCache
-from platformio.commands.home import helpers
 from platformio.device.list import list_logical_devices
+from platformio.home import helpers
 from platformio.http import ensure_internet_on
 
 
diff --git a/platformio/commands/home/rpc/handlers/piocore.py b/platformio/home/rpc/handlers/piocore.py
similarity index 99%
rename from platformio/commands/home/rpc/handlers/piocore.py
rename to platformio/home/rpc/handlers/piocore.py
index 01bbf90d..add05a31 100644
--- a/platformio/commands/home/rpc/handlers/piocore.py
+++ b/platformio/home/rpc/handlers/piocore.py
@@ -25,8 +25,8 @@ from ajsonrpc.core import JSONRPC20DispatchException
 from starlette.concurrency import run_in_threadpool
 
 from platformio import __main__, __version__, fs, proc
-from platformio.commands.home import helpers
 from platformio.compat import get_locale_encoding, is_bytes
+from platformio.home import helpers
 
 
 class MultiThreadingStdStream(object):
diff --git a/platformio/commands/home/rpc/handlers/project.py b/platformio/home/rpc/handlers/project.py
similarity index 98%
rename from platformio/commands/home/rpc/handlers/project.py
rename to platformio/home/rpc/handlers/project.py
index 8418fa60..13a9ebbb 100644
--- a/platformio/commands/home/rpc/handlers/project.py
+++ b/platformio/home/rpc/handlers/project.py
@@ -21,8 +21,8 @@ import time
 from ajsonrpc.core import JSONRPC20DispatchException
 
 from platformio import exception, fs
-from platformio.commands.home.rpc.handlers.app import AppRPC
-from platformio.commands.home.rpc.handlers.piocore import PIOCoreRPC
+from platformio.home.rpc.handlers.app import AppRPC
+from platformio.home.rpc.handlers.piocore import PIOCoreRPC
 from platformio.package.manager.platform import PlatformPackageManager
 from platformio.project.config import ProjectConfig
 from platformio.project.exception import ProjectError
diff --git a/platformio/commands/home/rpc/server.py b/platformio/home/rpc/server.py
similarity index 100%
rename from platformio/commands/home/rpc/server.py
rename to platformio/home/rpc/server.py
diff --git a/platformio/commands/home/run.py b/platformio/home/run.py
similarity index 86%
rename from platformio/commands/home/run.py
rename to platformio/home/run.py
index 64d820ea..a5306ad0 100644
--- a/platformio/commands/home/run.py
+++ b/platformio/home/run.py
@@ -24,16 +24,16 @@ from starlette.routing import Mount, Route, WebSocketRoute
 from starlette.staticfiles import StaticFiles
 from starlette.status import HTTP_403_FORBIDDEN
 
-from platformio.commands.home.rpc.handlers.account import AccountRPC
-from platformio.commands.home.rpc.handlers.app import AppRPC
-from platformio.commands.home.rpc.handlers.ide import IDERPC
-from platformio.commands.home.rpc.handlers.misc import MiscRPC
-from platformio.commands.home.rpc.handlers.os import OSRPC
-from platformio.commands.home.rpc.handlers.piocore import PIOCoreRPC
-from platformio.commands.home.rpc.handlers.project import ProjectRPC
-from platformio.commands.home.rpc.server import WebSocketJSONRPCServerFactory
 from platformio.compat import aio_get_running_loop
 from platformio.exception import PlatformioException
+from platformio.home.rpc.handlers.account import AccountRPC
+from platformio.home.rpc.handlers.app import AppRPC
+from platformio.home.rpc.handlers.ide import IDERPC
+from platformio.home.rpc.handlers.misc import MiscRPC
+from platformio.home.rpc.handlers.os import OSRPC
+from platformio.home.rpc.handlers.piocore import PIOCoreRPC
+from platformio.home.rpc.handlers.project import ProjectRPC
+from platformio.home.rpc.server import WebSocketJSONRPCServerFactory
 from platformio.package.manager.core import get_core_package_dir
 from platformio.proc import force_exit