diff --git a/optimum/commands/__init__.py b/optimum/commands/__init__.py
index 37bacd87fc..8a2a276d1c 100644
--- a/optimum/commands/__init__.py
+++ b/optimum/commands/__init__.py
@@ -15,5 +15,4 @@
 from .base import BaseOptimumCLICommand, CommandInfo, RootOptimumCLICommand
 from .env import EnvironmentCommand
 from .export import ExportCommand, ONNXExportCommand, TFLiteExportCommand
-from .onnxruntime import ONNXRuntimeCommand, ONNXRuntimeOptimizeCommand, ONNXRuntimeQuantizeCommand
 from .optimum_cli import optimum_cli_subcommand
diff --git a/optimum/commands/optimum_cli.py b/optimum/commands/optimum_cli.py
index 87ada7c895..64a7075c6c 100644
--- a/optimum/commands/optimum_cli.py
+++ b/optimum/commands/optimum_cli.py
@@ -22,13 +22,12 @@
 from .base import BaseOptimumCLICommand, CommandInfo, RootOptimumCLICommand
 from .env import EnvironmentCommand
 from .export import ExportCommand
-from .onnxruntime import ONNXRuntimeCommand
 
 
 logger = logging.get_logger()
 
 # The table below contains the optimum-cli root subcommands provided by the optimum package
-OPTIMUM_CLI_ROOT_SUBCOMMANDS = [ExportCommand, EnvironmentCommand, ONNXRuntimeCommand]
+OPTIMUM_CLI_ROOT_SUBCOMMANDS = [ExportCommand, EnvironmentCommand]
 
 # The table below is dynamically populated when loading subpackages
 _OPTIMUM_CLI_SUBCOMMANDS = []
diff --git a/optimum/onnxruntime/subpackage/__init__.py b/optimum/onnxruntime/subpackage/__init__.py
new file mode 100644
index 0000000000..7029af7132
--- /dev/null
+++ b/optimum/onnxruntime/subpackage/__init__.py
@@ -0,0 +1 @@
+from .commands import ONNXRuntimeCommand
diff --git a/optimum/commands/onnxruntime/__init__.py b/optimum/onnxruntime/subpackage/commands/__init__.py
similarity index 87%
rename from optimum/commands/onnxruntime/__init__.py
rename to optimum/onnxruntime/subpackage/commands/__init__.py
index 1b9c24c3b2..44facf5ea5 100644
--- a/optimum/commands/onnxruntime/__init__.py
+++ b/optimum/onnxruntime/subpackage/commands/__init__.py
@@ -14,5 +14,3 @@
 # limitations under the License.
 
 from .base import ONNXRuntimeCommand
-from .optimize import ONNXRuntimeOptimizeCommand
-from .quantize import ONNXRuntimeQuantizeCommand
diff --git a/optimum/commands/onnxruntime/base.py b/optimum/onnxruntime/subpackage/commands/base.py
similarity index 91%
rename from optimum/commands/onnxruntime/base.py
rename to optimum/onnxruntime/subpackage/commands/base.py
index 53e3245ea4..df4414c19d 100644
--- a/optimum/commands/onnxruntime/base.py
+++ b/optimum/onnxruntime/subpackage/commands/base.py
@@ -14,11 +14,13 @@
 # limitations under the License.
 """optimum.onnxruntime command-line interface base classes."""
 
-from .. import BaseOptimumCLICommand, CommandInfo
+from optimum.commands import BaseOptimumCLICommand, CommandInfo, optimum_cli_subcommand
+
 from .optimize import ONNXRuntimeOptimizeCommand
 from .quantize import ONNXRuntimeQuantizeCommand
 
 
+@optimum_cli_subcommand()
 class ONNXRuntimeCommand(BaseOptimumCLICommand):
     COMMAND = CommandInfo(
         name="onnxruntime",
diff --git a/optimum/commands/onnxruntime/optimize.py b/optimum/onnxruntime/subpackage/commands/optimize.py
similarity index 96%
rename from optimum/commands/onnxruntime/optimize.py
rename to optimum/onnxruntime/subpackage/commands/optimize.py
index 5890e0a07c..1dd82f0ee2 100644
--- a/optimum/commands/onnxruntime/optimize.py
+++ b/optimum/onnxruntime/subpackage/commands/optimize.py
@@ -75,8 +75,8 @@ def parse_args(parser: "ArgumentParser"):
         return parse_args_onnxruntime_optimize(parser)
 
     def run(self):
-        from ...onnxruntime.configuration import AutoOptimizationConfig, ORTConfig
-        from ...onnxruntime.optimization import ORTOptimizer
+        from ...configuration import AutoOptimizationConfig, ORTConfig
+        from ...optimization import ORTOptimizer
 
         if self.args.output == self.args.onnx_model:
             raise ValueError("The output directory must be different than the directory hosting the ONNX model.")
diff --git a/optimum/commands/onnxruntime/quantize.py b/optimum/onnxruntime/subpackage/commands/quantize.py
similarity index 95%
rename from optimum/commands/onnxruntime/quantize.py
rename to optimum/onnxruntime/subpackage/commands/quantize.py
index 2613cb33ba..6f6d843cc7 100644
--- a/optimum/commands/onnxruntime/quantize.py
+++ b/optimum/onnxruntime/subpackage/commands/quantize.py
@@ -17,7 +17,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from .. import BaseOptimumCLICommand
+from optimum.commands import BaseOptimumCLICommand
 
 
 if TYPE_CHECKING:
@@ -69,8 +69,8 @@ def parse_args(parser: "ArgumentParser"):
         return parse_args_onnxruntime_quantize(parser)
 
     def run(self):
-        from ...onnxruntime.configuration import AutoQuantizationConfig, ORTConfig
-        from ...onnxruntime.quantization import ORTQuantizer
+        from ...configuration import AutoQuantizationConfig, ORTConfig
+        from ...quantization import ORTQuantizer
 
         if self.args.output == self.args.onnx_model:
             raise ValueError("The output directory must be different than the directory hosting the ONNX model.")
diff --git a/optimum/subpackages.py b/optimum/subpackages.py
index 9f905cba44..40b21f63f6 100644
--- a/optimum/subpackages.py
+++ b/optimum/subpackages.py
@@ -8,6 +8,8 @@
     import importlib_metadata
 from importlib.util import find_spec, module_from_spec
 
+from .utils import is_onnxruntime_available
+
 
 logger = logging.getLogger(__name__)
 
@@ -54,6 +56,11 @@ def load_subpackages():
 
     This module is then in charge of registering the subpackage commands.
     """
+
     OPTIMUM_NAMESPACE = "optimum"
     OPTIMUM_SUBPACKAGE_LOADER = "subpackage"
     load_namespace_modules(OPTIMUM_NAMESPACE, OPTIMUM_SUBPACKAGE_LOADER)
+
+    # Load subpackages from internal modules not explicitly defined as namespace packages
+    if is_onnxruntime_available():
+        from .onnxruntime import subpackage  # noqa: F401