diff --git a/platformio/commands/debug/command.py b/platformio/commands/debug/command.py
index c3c29dd1..25286111 100644
--- a/platformio/commands/debug/command.py
+++ b/platformio/commands/debug/command.py
@@ -148,7 +148,7 @@ def cli(ctx, project_dir, project_conf, environment, verbose, interface, __unpro
     inject_contrib_pysite()
 
     # pylint: disable=import-outside-toplevel
-    from platformio.commands.debug.client import GDBClient, reactor
+    from platformio.commands.debug.process.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/process/__init__.py b/platformio/commands/debug/process/__init__.py
new file mode 100644
index 00000000..b0514903
--- /dev/null
+++ b/platformio/commands/debug/process/__init__.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
diff --git a/platformio/commands/debug/process.py b/platformio/commands/debug/process/base.py
similarity index 100%
rename from platformio/commands/debug/process.py
rename to platformio/commands/debug/process/base.py
diff --git a/platformio/commands/debug/client.py b/platformio/commands/debug/process/client.py
similarity index 98%
rename from platformio/commands/debug/client.py
rename to platformio/commands/debug/process/client.py
index 4e2298f9..7ae5363e 100644
--- a/platformio/commands/debug/client.py
+++ b/platformio/commands/debug/process/client.py
@@ -30,8 +30,8 @@ from platformio import app, fs, proc, telemetry, util
 from platformio.commands.debug import helpers
 from platformio.commands.debug.exception import DebugInvalidOptionsError
 from platformio.commands.debug.initcfgs import get_gdb_init_config
-from platformio.commands.debug.process import BaseProcess
-from platformio.commands.debug.server import DebugServer
+from platformio.commands.debug.process.base import BaseProcess
+from platformio.commands.debug.process.server import DebugServer
 from platformio.compat import hashlib_encode_data, is_bytes
 from platformio.project.helpers import get_project_cache_dir
 
diff --git a/platformio/commands/debug/server.py b/platformio/commands/debug/process/server.py
similarity index 98%
rename from platformio/commands/debug/server.py
rename to platformio/commands/debug/process/server.py
index ef06b58c..7bd5d485 100644
--- a/platformio/commands/debug/server.py
+++ b/platformio/commands/debug/process/server.py
@@ -22,7 +22,7 @@ from twisted.internet import reactor  # pylint: disable=import-error
 from platformio import fs, util
 from platformio.commands.debug.exception import DebugInvalidOptionsError
 from platformio.commands.debug.helpers import escape_gdbmi_stream, is_gdbmi_mode
-from platformio.commands.debug.process import BaseProcess
+from platformio.commands.debug.process.base import BaseProcess
 from platformio.proc import where_is_program
 
 
diff --git a/platformio/package/exception.py b/platformio/package/exception.py
index 11555291..adadc088 100644
--- a/platformio/package/exception.py
+++ b/platformio/package/exception.py
@@ -41,5 +41,6 @@ class ManifestValidationError(ManifestException):
     def __str__(self):
         return (
             "Invalid manifest fields: %s. \nPlease check specification -> "
-            "https://docs.platformio.org/page/librarymanager/config.html" % self.messages
+            "https://docs.platformio.org/page/librarymanager/config.html"
+            % self.messages
         )