diff --git a/platformio/commands/check/__init__.py b/platformio/check/__init__.py
similarity index 100%
rename from platformio/commands/check/__init__.py
rename to platformio/check/__init__.py
diff --git a/platformio/commands/check/command.py b/platformio/check/cli.py
similarity index 98%
rename from platformio/commands/check/command.py
rename to platformio/check/cli.py
index e24836cc..3033008e 100644
--- a/platformio/commands/check/command.py
+++ b/platformio/check/cli.py
@@ -26,8 +26,8 @@ import click
 from tabulate import tabulate
 
 from platformio import app, exception, fs, util
-from platformio.commands.check.defect import DefectItem
-from platformio.commands.check.tools import CheckToolFactory
+from platformio.check.defect import DefectItem
+from platformio.check.tools import CheckToolFactory
 from platformio.project.config import ProjectConfig
 from platformio.project.helpers import find_project_dir_above, get_project_dir
 
diff --git a/platformio/commands/check/defect.py b/platformio/check/defect.py
similarity index 100%
rename from platformio/commands/check/defect.py
rename to platformio/check/defect.py
diff --git a/platformio/commands/check/tools/__init__.py b/platformio/check/tools/__init__.py
similarity index 83%
rename from platformio/commands/check/tools/__init__.py
rename to platformio/check/tools/__init__.py
index 9c4b1b7e..824df5bb 100644
--- a/platformio/commands/check/tools/__init__.py
+++ b/platformio/check/tools/__init__.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 from platformio import exception
-from platformio.commands.check.tools.clangtidy import ClangtidyCheckTool
-from platformio.commands.check.tools.cppcheck import CppcheckCheckTool
-from platformio.commands.check.tools.pvsstudio import PvsStudioCheckTool
+from platformio.check.tools.clangtidy import ClangtidyCheckTool
+from platformio.check.tools.cppcheck import CppcheckCheckTool
+from platformio.check.tools.pvsstudio import PvsStudioCheckTool
 
 
 class CheckToolFactory(object):
diff --git a/platformio/commands/check/tools/base.py b/platformio/check/tools/base.py
similarity index 99%
rename from platformio/commands/check/tools/base.py
rename to platformio/check/tools/base.py
index 07636e1f..90c58bc1 100644
--- a/platformio/commands/check/tools/base.py
+++ b/platformio/check/tools/base.py
@@ -19,7 +19,7 @@ import tempfile
 import click
 
 from platformio import fs, proc
-from platformio.commands.check.defect import DefectItem
+from platformio.check.defect import DefectItem
 from platformio.package.manager.core import get_core_package_dir
 from platformio.package.meta import PackageSpec
 from platformio.project.helpers import load_build_metadata
diff --git a/platformio/commands/check/tools/clangtidy.py b/platformio/check/tools/clangtidy.py
similarity index 96%
rename from platformio/commands/check/tools/clangtidy.py
rename to platformio/check/tools/clangtidy.py
index c357cf4d..682a2cb7 100644
--- a/platformio/commands/check/tools/clangtidy.py
+++ b/platformio/check/tools/clangtidy.py
@@ -15,8 +15,8 @@
 import re
 from os.path import join
 
-from platformio.commands.check.defect import DefectItem
-from platformio.commands.check.tools.base import CheckToolBase
+from platformio.check.defect import DefectItem
+from platformio.check.tools.base import CheckToolBase
 
 
 class ClangtidyCheckTool(CheckToolBase):
diff --git a/platformio/commands/check/tools/cppcheck.py b/platformio/check/tools/cppcheck.py
similarity index 98%
rename from platformio/commands/check/tools/cppcheck.py
rename to platformio/check/tools/cppcheck.py
index ec2b96d3..0f8db402 100644
--- a/platformio/commands/check/tools/cppcheck.py
+++ b/platformio/check/tools/cppcheck.py
@@ -17,8 +17,8 @@ import os
 import click
 
 from platformio import proc
-from platformio.commands.check.defect import DefectItem
-from platformio.commands.check.tools.base import CheckToolBase
+from platformio.check.defect import DefectItem
+from platformio.check.tools.base import CheckToolBase
 
 
 class CppcheckCheckTool(CheckToolBase):
diff --git a/platformio/commands/check/tools/pvsstudio.py b/platformio/check/tools/pvsstudio.py
similarity index 98%
rename from platformio/commands/check/tools/pvsstudio.py
rename to platformio/check/tools/pvsstudio.py
index 0479d91e..ded65d1c 100644
--- a/platformio/commands/check/tools/pvsstudio.py
+++ b/platformio/check/tools/pvsstudio.py
@@ -20,8 +20,8 @@ from xml.etree.ElementTree import fromstring
 import click
 
 from platformio import proc
-from platformio.commands.check.defect import DefectItem
-from platformio.commands.check.tools.base import CheckToolBase
+from platformio.check.defect import DefectItem
+from platformio.check.tools.base import CheckToolBase
 from platformio.compat import IS_WINDOWS
 
 
diff --git a/tests/commands/test_check.py b/tests/commands/test_check.py
index 746a81dd..be6042ca 100644
--- a/tests/commands/test_check.py
+++ b/tests/commands/test_check.py
@@ -21,7 +21,7 @@ from os.path import isfile, join
 import pytest
 
 from platformio import fs
-from platformio.commands.check.command import cli as cmd_check
+from platformio.check.cli import cli as cmd_check
 
 DEFAULT_CONFIG = """
 [env:native]