diff --git a/platformio/commands/run/command.py b/platformio/commands/run.py
similarity index 98%
rename from platformio/commands/run/command.py
rename to platformio/commands/run.py
index 0349ab03..b9cf3459 100644
--- a/platformio/commands/run/command.py
+++ b/platformio/commands/run.py
@@ -22,10 +22,10 @@ from tabulate import tabulate
 
 from platformio import exception, fs, util
 from platformio.commands.device import device_monitor as cmd_device_monitor
-from platformio.commands.run.helpers import clean_build_dir, handle_legacy_libdeps
-from platformio.commands.run.processor import EnvironmentProcessor
 from platformio.project.config import ProjectConfig
 from platformio.project.helpers import find_project_dir_above, get_project_build_dir
+from platformio.run.helpers import clean_build_dir, handle_legacy_libdeps
+from platformio.run.processor import EnvironmentProcessor
 from platformio.test.processor import CTX_META_TEST_IS_RUNNING
 
 # pylint: disable=too-many-arguments,too-many-locals,too-many-branches
diff --git a/platformio/commands/run/__init__.py b/platformio/run/__init__.py
similarity index 92%
rename from platformio/commands/run/__init__.py
rename to platformio/run/__init__.py
index 05d4d370..b0514903 100644
--- a/platformio/commands/run/__init__.py
+++ b/platformio/run/__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.run.command import cli
diff --git a/platformio/commands/run/helpers.py b/platformio/run/helpers.py
similarity index 100%
rename from platformio/commands/run/helpers.py
rename to platformio/run/helpers.py
diff --git a/platformio/commands/run/processor.py b/platformio/run/processor.py
similarity index 100%
rename from platformio/commands/run/processor.py
rename to platformio/run/processor.py