diff --git a/platformio/commands/debug/command.py b/platformio/commands/debug.py
similarity index 97%
rename from platformio/commands/debug/command.py
rename to platformio/commands/debug.py
index 64e62765..470fdd97 100644
--- a/platformio/commands/debug/command.py
+++ b/platformio/commands/debug.py
@@ -22,7 +22,7 @@ from os.path import isfile, join
 import click
 
 from platformio import exception, fs, proc, util
-from platformio.commands.debug import helpers
+from platformio.debug import helpers
 from platformio.managers.core import inject_contrib_pysite
 from platformio.project.config import ProjectConfig
 from platformio.project.helpers import is_platformio_project, load_project_ide_data
@@ -137,7 +137,7 @@ def cli(ctx, project_dir, project_conf, environment, verbose, interface, __unpro
 
     # run debugging client
     inject_contrib_pysite()
-    from platformio.commands.debug.client import GDBClient, reactor
+    from platformio.debug.client import GDBClient, reactor
 
     client = GDBClient(project_dir, __unprocessed, debug_options, env_options)
     client.spawn(configuration["gdb_path"], configuration["prog_path"])
diff --git a/platformio/commands/debug/__init__.py b/platformio/debug/__init__.py
similarity index 92%
rename from platformio/commands/debug/__init__.py
rename to platformio/debug/__init__.py
index 7fba44c2..b0514903 100644
--- a/platformio/commands/debug/__init__.py
+++ b/platformio/debug/__init__.py
@@ -11,5 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-from platformio.commands.debug.command import cli
diff --git a/platformio/commands/debug/client.py b/platformio/debug/client.py
similarity index 98%
rename from platformio/commands/debug/client.py
rename to platformio/debug/client.py
index 2334fbf9..63b07c5e 100644
--- a/platformio/commands/debug/client.py
+++ b/platformio/debug/client.py
@@ -27,10 +27,10 @@ from twisted.internet import stdio  # pylint: disable=import-error
 from twisted.internet import task  # pylint: disable=import-error
 
 from platformio import app, exception, fs, proc, util
-from platformio.commands.debug import helpers, initcfgs
-from platformio.commands.debug.process import BaseProcess
-from platformio.commands.debug.server import DebugServer
 from platformio.compat import hashlib_encode_data
+from platformio.debug import helpers, initcfgs
+from platformio.debug.process import BaseProcess
+from platformio.debug.server import DebugServer
 from platformio.project.helpers import get_project_cache_dir
 from platformio.telemetry import MeasurementProtocol
 
diff --git a/platformio/commands/debug/helpers.py b/platformio/debug/helpers.py
similarity index 100%
rename from platformio/commands/debug/helpers.py
rename to platformio/debug/helpers.py
diff --git a/platformio/commands/debug/initcfgs.py b/platformio/debug/initcfgs.py
similarity index 100%
rename from platformio/commands/debug/initcfgs.py
rename to platformio/debug/initcfgs.py
diff --git a/platformio/commands/debug/process.py b/platformio/debug/process.py
similarity index 100%
rename from platformio/commands/debug/process.py
rename to platformio/debug/process.py
diff --git a/platformio/commands/debug/server.py b/platformio/debug/server.py
similarity index 98%
rename from platformio/commands/debug/server.py
rename to platformio/debug/server.py
index 213c413e..fbce1268 100644
--- a/platformio/commands/debug/server.py
+++ b/platformio/debug/server.py
@@ -19,7 +19,7 @@ from twisted.internet import error  # pylint: disable=import-error
 from twisted.internet import reactor  # pylint: disable=import-error
 
 from platformio import exception, fs, util
-from platformio.commands.debug.process import BaseProcess
+from platformio.debug.process import BaseProcess
 from platformio.proc import where_is_program