Rename modules

- Rename module "mlia.devices" into "mlia.target"
- Rename module "mlia.target.ethosu" into "mlia.target.ethos_u"
- Rename module "mlia.target.cortexa" into "mlia.target.cortex_a"
- Rename and update tests

Change-Id: I6dca7c8646d881f739fb6b5914d1cc7e45e63dc2

59 files changed, 173 insertions, 173 deletions

diff --git a/src/mlia/api.py b/src/mlia/api.py
index 6af7db2..c7be9ec 100644
--- a/src/mlia/api.py
+++ b/src/mlia/api.py
@@ -12,12 +12,12 @@ from mlia.core.advisor import InferenceAdvisor
 from mlia.core.common import AdviceCategory
 from mlia.core.context import ExecutionContext
 from mlia.core.typing import PathOrFileLike
-from mlia.devices.cortexa.advisor import configure_and_get_cortexa_advisor
-from mlia.devices.cortexa.operators import report as cortex_a_report
-from mlia.devices.ethosu.advisor import configure_and_get_ethosu_advisor
-from mlia.devices.ethosu.operators import report as ethos_u_report
-from mlia.devices.tosa.advisor import configure_and_get_tosa_advisor
-from mlia.devices.tosa.operators import report as tosa_report
+from mlia.target.cortex_a.advisor import configure_and_get_cortexa_advisor
+from mlia.target.cortex_a.operators import report as cortex_a_report
+from mlia.target.ethos_u.advisor import configure_and_get_ethosu_advisor
+from mlia.target.ethos_u.operators import report as ethos_u_report
+from mlia.target.tosa.advisor import configure_and_get_tosa_advisor
+from mlia.target.tosa.operators import report as tosa_report
 from mlia.utils.filesystem import get_target
 
 logger = logging.getLogger(__name__)
diff --git a/src/mlia/devices/__init__.py b/src/mlia/target/__init__.py
index d533f4a..2370221 100644
--- a/src/mlia/devices/__init__.py
+++ b/src/mlia/target/__init__.py
@@ -1,3 +1,3 @@
 # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
-"""Devices module."""
+"""Target module."""
diff --git a/src/mlia/devices/config.py b/src/mlia/target/config.py
index 7ab6b43..7ab6b43 100644
--- a/src/mlia/devices/config.py
+++ b/src/mlia/target/config.py
diff --git a/src/mlia/devices/ethosu/__init__.py b/src/mlia/target/cortex_a/__init__.py
index 73925e1..fe01835 100644
--- a/src/mlia/devices/ethosu/__init__.py
+++ b/src/mlia/target/cortex_a/__init__.py
@@ -1,3 +1,3 @@
 # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
-"""Ethos-U devices module."""
+"""Cortex-A target module."""
diff --git a/src/mlia/devices/cortexa/advice_generation.py b/src/mlia/target/cortex_a/advice_generation.py
index bab9530..b68106e 100644
--- a/src/mlia/devices/cortexa/advice_generation.py
+++ b/src/mlia/target/cortex_a/advice_generation.py
@@ -7,11 +7,11 @@ from mlia.core.advice_generation import advice_category
 from mlia.core.advice_generation import FactBasedAdviceProducer
 from mlia.core.common import AdviceCategory
 from mlia.core.common import DataItem
-from mlia.devices.cortexa.data_analysis import ModelHasCustomOperators
-from mlia.devices.cortexa.data_analysis import ModelIsCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotTFLiteCompatible
-from mlia.devices.cortexa.data_analysis import TFLiteCompatibilityCheckFailed
+from mlia.target.cortex_a.data_analysis import ModelHasCustomOperators
+from mlia.target.cortex_a.data_analysis import ModelIsCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotTFLiteCompatible
+from mlia.target.cortex_a.data_analysis import TFLiteCompatibilityCheckFailed
 
 
 class CortexAAdviceProducer(FactBasedAdviceProducer):
diff --git a/src/mlia/devices/cortexa/advisor.py b/src/mlia/target/cortex_a/advisor.py
index ffbbea5..5912e38 100644
--- a/src/mlia/devices/cortexa/advisor.py
+++ b/src/mlia/target/cortex_a/advisor.py
@@ -16,12 +16,12 @@ from mlia.core.data_analysis import DataAnalyzer
 from mlia.core.data_collection import DataCollector
 from mlia.core.events import Event
 from mlia.core.typing import PathOrFileLike
-from mlia.devices.cortexa.advice_generation import CortexAAdviceProducer
-from mlia.devices.cortexa.config import CortexAConfiguration
-from mlia.devices.cortexa.data_analysis import CortexADataAnalyzer
-from mlia.devices.cortexa.data_collection import CortexAOperatorCompatibility
-from mlia.devices.cortexa.events import CortexAAdvisorStartedEvent
-from mlia.devices.cortexa.handlers import CortexAEventHandler
+from mlia.target.cortex_a.advice_generation import CortexAAdviceProducer
+from mlia.target.cortex_a.config import CortexAConfiguration
+from mlia.target.cortex_a.data_analysis import CortexADataAnalyzer
+from mlia.target.cortex_a.data_collection import CortexAOperatorCompatibility
+from mlia.target.cortex_a.events import CortexAAdvisorStartedEvent
+from mlia.target.cortex_a.handlers import CortexAEventHandler
 
 
 class CortexAInferenceAdvisor(DefaultInferenceAdvisor):
diff --git a/src/mlia/devices/cortexa/config.py b/src/mlia/target/cortex_a/config.py
index ec0cf0a..b2b51ea 100644
--- a/src/mlia/devices/cortexa/config.py
+++ b/src/mlia/target/cortex_a/config.py
@@ -3,7 +3,7 @@
 """Cortex-A configuration."""
 from __future__ import annotations
 
-from mlia.devices.config import IPConfiguration
+from mlia.target.config import IPConfiguration
 from mlia.utils.filesystem import get_profile
 
 
diff --git a/src/mlia/devices/cortexa/data_analysis.py b/src/mlia/target/cortex_a/data_analysis.py
index 04bc819..4a3a068 100644
--- a/src/mlia/devices/cortexa/data_analysis.py
+++ b/src/mlia/target/cortex_a/data_analysis.py
@@ -11,9 +11,9 @@ from functools import singledispatchmethod
 from mlia.core.common import DataItem
 from mlia.core.data_analysis import Fact
 from mlia.core.data_analysis import FactExtractor
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
-from mlia.devices.cortexa.operators import Operator
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.operators import Operator
 
 
 class CortexADataAnalyzer(FactExtractor):
diff --git a/src/mlia/devices/cortexa/data_collection.py b/src/mlia/target/cortex_a/data_collection.py
index f4d5a82..3ec63e2 100644
--- a/src/mlia/devices/cortexa/data_collection.py
+++ b/src/mlia/target/cortex_a/data_collection.py
@@ -7,12 +7,12 @@ import logging
 from pathlib import Path
 
 from mlia.core.data_collection import ContextAwareDataCollector
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
-from mlia.devices.cortexa.operators import get_cortex_a_compatibility_info
 from mlia.nn.tensorflow.config import get_tflite_model
 from mlia.nn.tensorflow.tflite_compat import TFLiteChecker
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo
 from mlia.nn.tensorflow.utils import is_tflite_model
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.operators import get_cortex_a_compatibility_info
 from mlia.utils.logging import log_action
 
 
diff --git a/src/mlia/devices/cortexa/events.py b/src/mlia/target/cortex_a/events.py
index dece4c7..a172d0d 100644
--- a/src/mlia/devices/cortexa/events.py
+++ b/src/mlia/target/cortex_a/events.py
@@ -6,7 +6,7 @@ from pathlib import Path
 
 from mlia.core.events import Event
 from mlia.core.events import EventDispatcher
-from mlia.devices.cortexa.config import CortexAConfiguration
+from mlia.target.cortex_a.config import CortexAConfiguration
 
 
 @dataclass
diff --git a/src/mlia/devices/cortexa/handlers.py b/src/mlia/target/cortex_a/handlers.py
index 7ed2b75..b2d5faa 100644
--- a/src/mlia/devices/cortexa/handlers.py
+++ b/src/mlia/target/cortex_a/handlers.py
@@ -8,11 +8,11 @@ import logging
 from mlia.core.events import CollectedDataEvent
 from mlia.core.handlers import WorkflowEventsHandler
 from mlia.core.typing import PathOrFileLike
-from mlia.devices.cortexa.events import CortexAAdvisorEventHandler
-from mlia.devices.cortexa.events import CortexAAdvisorStartedEvent
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
-from mlia.devices.cortexa.reporters import cortex_a_formatters
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo
+from mlia.target.cortex_a.events import CortexAAdvisorEventHandler
+from mlia.target.cortex_a.events import CortexAAdvisorStartedEvent
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.reporters import cortex_a_formatters
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/mlia/devices/cortexa/operator_compatibility.py b/src/mlia/target/cortex_a/operator_compatibility.py
index c474e75..c474e75 100644
--- a/src/mlia/devices/cortexa/operator_compatibility.py
+++ b/src/mlia/target/cortex_a/operator_compatibility.py
diff --git a/src/mlia/devices/cortexa/operators.py b/src/mlia/target/cortex_a/operators.py
index 3e84d64..91f1886 100644
--- a/src/mlia/devices/cortexa/operators.py
+++ b/src/mlia/target/cortex_a/operators.py
@@ -9,12 +9,12 @@ from pathlib import Path
 from typing import Any
 from typing import ClassVar
 
-from mlia.devices.cortexa.operator_compatibility import (
-    ARMNN_TFLITE_DELEGATE as TFLITE_DELEGATE_COMPAT,
-)
 from mlia.nn.tensorflow.tflite_graph import Op
 from mlia.nn.tensorflow.tflite_graph import parse_subgraphs
 from mlia.nn.tensorflow.tflite_graph import TFL_ACTIVATION_FUNCTION
+from mlia.target.cortex_a.operator_compatibility import (
+    ARMNN_TFLITE_DELEGATE as TFLITE_DELEGATE_COMPAT,
+)
 
 
 @dataclass
diff --git a/src/mlia/devices/cortexa/reporters.py b/src/mlia/target/cortex_a/reporters.py
index 84de10b..d43d6c3 100644
--- a/src/mlia/devices/cortexa/reporters.py
+++ b/src/mlia/target/cortex_a/reporters.py
@@ -16,9 +16,9 @@ from mlia.core.reporting import NestedReport
 from mlia.core.reporting import Report
 from mlia.core.reporting import ReportItem
 from mlia.core.reporting import Table
-from mlia.devices.cortexa.config import CortexAConfiguration
-from mlia.devices.cortexa.operators import Operator
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo
+from mlia.target.cortex_a.config import CortexAConfiguration
+from mlia.target.cortex_a.operators import Operator
 from mlia.utils.console import style_improvement
 from mlia.utils.types import is_list_of
 
diff --git a/src/mlia/devices/cortexa/__init__.py b/src/mlia/target/ethos_u/__init__.py
index 3a987e7..503919d 100644
--- a/src/mlia/devices/cortexa/__init__.py
+++ b/src/mlia/target/ethos_u/__init__.py
@@ -1,3 +1,3 @@
 # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
-"""Cortex-A devices module."""
+"""Ethos-U target module."""
diff --git a/src/mlia/devices/ethosu/advice_generation.py b/src/mlia/target/ethos_u/advice_generation.py
index 1910460..edd78fd 100644
--- a/src/mlia/devices/ethosu/advice_generation.py
+++ b/src/mlia/target/ethos_u/advice_generation.py
@@ -11,11 +11,11 @@ from mlia.core.advice_generation import ContextAwareAdviceProducer
 from mlia.core.advice_generation import FactBasedAdviceProducer
 from mlia.core.common import AdviceCategory
 from mlia.core.common import DataItem
-from mlia.devices.ethosu.data_analysis import AllOperatorsSupportedOnNPU
-from mlia.devices.ethosu.data_analysis import HasCPUOnlyOperators
-from mlia.devices.ethosu.data_analysis import HasUnsupportedOnNPUOperators
-from mlia.devices.ethosu.data_analysis import OptimizationResults
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.data_analysis import AllOperatorsSupportedOnNPU
+from mlia.target.ethos_u.data_analysis import HasCPUOnlyOperators
+from mlia.target.ethos_u.data_analysis import HasUnsupportedOnNPUOperators
+from mlia.target.ethos_u.data_analysis import OptimizationResults
 
 
 class EthosUAdviceProducer(FactBasedAdviceProducer):
diff --git a/src/mlia/devices/ethosu/advisor.py b/src/mlia/target/ethos_u/advisor.py
index 2c25f6c..b9d64ff 100644
--- a/src/mlia/devices/ethosu/advisor.py
+++ b/src/mlia/target/ethos_u/advisor.py
@@ -16,17 +16,17 @@ from mlia.core.data_analysis import DataAnalyzer
 from mlia.core.data_collection import DataCollector
 from mlia.core.events import Event
 from mlia.core.typing import PathOrFileLike
-from mlia.devices.ethosu.advice_generation import EthosUAdviceProducer
-from mlia.devices.ethosu.advice_generation import EthosUStaticAdviceProducer
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.config import get_target
-from mlia.devices.ethosu.data_analysis import EthosUDataAnalyzer
-from mlia.devices.ethosu.data_collection import EthosUOperatorCompatibility
-from mlia.devices.ethosu.data_collection import EthosUOptimizationPerformance
-from mlia.devices.ethosu.data_collection import EthosUPerformance
-from mlia.devices.ethosu.events import EthosUAdvisorStartedEvent
-from mlia.devices.ethosu.handlers import EthosUEventHandler
 from mlia.nn.tensorflow.utils import is_tflite_model
+from mlia.target.ethos_u.advice_generation import EthosUAdviceProducer
+from mlia.target.ethos_u.advice_generation import EthosUStaticAdviceProducer
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.config import get_target
+from mlia.target.ethos_u.data_analysis import EthosUDataAnalyzer
+from mlia.target.ethos_u.data_collection import EthosUOperatorCompatibility
+from mlia.target.ethos_u.data_collection import EthosUOptimizationPerformance
+from mlia.target.ethos_u.data_collection import EthosUPerformance
+from mlia.target.ethos_u.events import EthosUAdvisorStartedEvent
+from mlia.target.ethos_u.handlers import EthosUEventHandler
 from mlia.utils.types import is_list_of
 
 
diff --git a/src/mlia/devices/ethosu/config.py b/src/mlia/target/ethos_u/config.py
index f2e867e..8d8f481 100644
--- a/src/mlia/devices/ethosu/config.py
+++ b/src/mlia/target/ethos_u/config.py
@@ -8,7 +8,7 @@ from typing import Any
 
 from mlia.backend.vela.compiler import resolve_compiler_config
 from mlia.backend.vela.compiler import VelaCompilerOptions
-from mlia.devices.config import IPConfiguration
+from mlia.target.config import IPConfiguration
 from mlia.utils.filesystem import get_profile
 from mlia.utils.filesystem import get_vela_config
 
diff --git a/src/mlia/devices/ethosu/data_analysis.py b/src/mlia/target/ethos_u/data_analysis.py
index db89a5f..6b66734 100644
--- a/src/mlia/devices/ethosu/data_analysis.py
+++ b/src/mlia/target/ethos_u/data_analysis.py
@@ -10,8 +10,8 @@ from mlia.backend.vela.compat import Operators
 from mlia.core.common import DataItem
 from mlia.core.data_analysis import Fact
 from mlia.core.data_analysis import FactExtractor
-from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics
 
 
 @dataclass
diff --git a/src/mlia/devices/ethosu/data_collection.py b/src/mlia/target/ethos_u/data_collection.py
index d68eadb..258876d 100644
--- a/src/mlia/devices/ethosu/data_collection.py
+++ b/src/mlia/target/ethos_u/data_collection.py
@@ -12,16 +12,16 @@ from mlia.core.context import Context
 from mlia.core.data_collection import ContextAwareDataCollector
 from mlia.core.errors import FunctionalityNotSupportedError
 from mlia.core.performance import estimate_performance
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.performance import EthosUPerformanceEstimator
-from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics
-from mlia.devices.ethosu.performance import PerformanceMetrics
 from mlia.nn.tensorflow.config import get_keras_model
 from mlia.nn.tensorflow.config import get_tflite_model
 from mlia.nn.tensorflow.config import KerasModel
 from mlia.nn.tensorflow.optimizations.select import get_optimizer
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
 from mlia.nn.tensorflow.utils import save_keras_model
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.performance import EthosUPerformanceEstimator
+from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics
+from mlia.target.ethos_u.performance import PerformanceMetrics
 from mlia.utils.logging import log_action
 from mlia.utils.types import is_list_of
 
diff --git a/src/mlia/devices/ethosu/events.py b/src/mlia/target/ethos_u/events.py
index d5408b0..37cc1a9 100644
--- a/src/mlia/devices/ethosu/events.py
+++ b/src/mlia/target/ethos_u/events.py
@@ -6,7 +6,7 @@ from pathlib import Path
 
 from mlia.core.events import Event
 from mlia.core.events import EventDispatcher
-from mlia.devices.ethosu.config import EthosUConfiguration
+from mlia.target.ethos_u.config import EthosUConfiguration
 
 
 @dataclass
diff --git a/src/mlia/devices/ethosu/handlers.py b/src/mlia/target/ethos_u/handlers.py
index f010bdb..84a9554 100644
--- a/src/mlia/devices/ethosu/handlers.py
+++ b/src/mlia/target/ethos_u/handlers.py
@@ -9,11 +9,11 @@ from mlia.backend.vela.compat import Operators
 from mlia.core.events import CollectedDataEvent
 from mlia.core.handlers import WorkflowEventsHandler
 from mlia.core.typing import PathOrFileLike
-from mlia.devices.ethosu.events import EthosUAdvisorEventHandler
-from mlia.devices.ethosu.events import EthosUAdvisorStartedEvent
-from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics
-from mlia.devices.ethosu.performance import PerformanceMetrics
-from mlia.devices.ethosu.reporters import ethos_u_formatters
+from mlia.target.ethos_u.events import EthosUAdvisorEventHandler
+from mlia.target.ethos_u.events import EthosUAdvisorStartedEvent
+from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics
+from mlia.target.ethos_u.performance import PerformanceMetrics
+from mlia.target.ethos_u.reporters import ethos_u_formatters
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/mlia/devices/ethosu/operators.py b/src/mlia/target/ethos_u/operators.py
index 97c2b17..97c2b17 100644
--- a/src/mlia/devices/ethosu/operators.py
+++ b/src/mlia/target/ethos_u/operators.py
diff --git a/src/mlia/devices/ethosu/performance.py b/src/mlia/target/ethos_u/performance.py
index 8051d6e..e39f4d9 100644
--- a/src/mlia/devices/ethosu/performance.py
+++ b/src/mlia/target/ethos_u/performance.py
@@ -18,10 +18,10 @@ from mlia.backend.install import is_supported
 from mlia.backend.install import supported_backends
 from mlia.core.context import Context
 from mlia.core.performance import PerformanceEstimator
-from mlia.devices.ethosu.config import EthosUConfiguration
 from mlia.nn.tensorflow.config import get_tflite_model
 from mlia.nn.tensorflow.config import ModelConfiguration
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.config import EthosUConfiguration
 from mlia.utils.logging import log_action
 
 
diff --git a/src/mlia/devices/ethosu/reporters.py b/src/mlia/target/ethos_u/reporters.py
index 7ecaab1..dbc6f4a 100644
--- a/src/mlia/devices/ethosu/reporters.py
+++ b/src/mlia/target/ethos_u/reporters.py
@@ -23,8 +23,8 @@ from mlia.core.reporting import Report
 from mlia.core.reporting import ReportItem
 from mlia.core.reporting import SingleRow
 from mlia.core.reporting import Table
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.performance import PerformanceMetrics
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.performance import PerformanceMetrics
 from mlia.utils.console import style_improvement
 from mlia.utils.types import is_list_of
 
diff --git a/src/mlia/devices/tosa/__init__.py b/src/mlia/target/tosa/__init__.py
index 762c831..762c831 100644
--- a/src/mlia/devices/tosa/__init__.py
+++ b/src/mlia/target/tosa/__init__.py
diff --git a/src/mlia/devices/tosa/advice_generation.py b/src/mlia/target/tosa/advice_generation.py
index a3d8011..f531b84 100644
--- a/src/mlia/devices/tosa/advice_generation.py
+++ b/src/mlia/target/tosa/advice_generation.py
@@ -7,8 +7,8 @@ from mlia.core.advice_generation import advice_category
 from mlia.core.advice_generation import FactBasedAdviceProducer
 from mlia.core.common import AdviceCategory
 from mlia.core.common import DataItem
-from mlia.devices.tosa.data_analysis import ModelIsNotTOSACompatible
-from mlia.devices.tosa.data_analysis import ModelIsTOSACompatible
+from mlia.target.tosa.data_analysis import ModelIsNotTOSACompatible
+from mlia.target.tosa.data_analysis import ModelIsTOSACompatible
 
 
 class TOSAAdviceProducer(FactBasedAdviceProducer):
diff --git a/src/mlia/devices/tosa/advisor.py b/src/mlia/target/tosa/advisor.py
index 53dfa87..2739dfd 100644
--- a/src/mlia/devices/tosa/advisor.py
+++ b/src/mlia/target/tosa/advisor.py
@@ -16,12 +16,12 @@ from mlia.core.data_analysis import DataAnalyzer
 from mlia.core.data_collection import DataCollector
 from mlia.core.events import Event
 from mlia.core.typing import PathOrFileLike
-from mlia.devices.tosa.advice_generation import TOSAAdviceProducer
-from mlia.devices.tosa.config import TOSAConfiguration
-from mlia.devices.tosa.data_analysis import TOSADataAnalyzer
-from mlia.devices.tosa.data_collection import TOSAOperatorCompatibility
-from mlia.devices.tosa.events import TOSAAdvisorStartedEvent
-from mlia.devices.tosa.handlers import TOSAEventHandler
+from mlia.target.tosa.advice_generation import TOSAAdviceProducer
+from mlia.target.tosa.config import TOSAConfiguration
+from mlia.target.tosa.data_analysis import TOSADataAnalyzer
+from mlia.target.tosa.data_collection import TOSAOperatorCompatibility
+from mlia.target.tosa.events import TOSAAdvisorStartedEvent
+from mlia.target.tosa.handlers import TOSAEventHandler
 
 
 class TOSAInferenceAdvisor(DefaultInferenceAdvisor):
diff --git a/src/mlia/devices/tosa/config.py b/src/mlia/target/tosa/config.py
index c3879a7..22805b7 100644
--- a/src/mlia/devices/tosa/config.py
+++ b/src/mlia/target/tosa/config.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
 """TOSA target configuration."""
-from mlia.devices.config import IPConfiguration
+from mlia.target.config import IPConfiguration
 from mlia.utils.filesystem import get_profile
 
 
diff --git a/src/mlia/devices/tosa/data_analysis.py b/src/mlia/target/tosa/data_analysis.py
index 7cbd61d..7cbd61d 100644
--- a/src/mlia/devices/tosa/data_analysis.py
+++ b/src/mlia/target/tosa/data_analysis.py
diff --git a/src/mlia/devices/tosa/data_collection.py b/src/mlia/target/tosa/data_collection.py
index 105c501..105c501 100644
--- a/src/mlia/devices/tosa/data_collection.py
+++ b/src/mlia/target/tosa/data_collection.py
diff --git a/src/mlia/devices/tosa/events.py b/src/mlia/target/tosa/events.py
index ceaba57..67d499d 100644
--- a/src/mlia/devices/tosa/events.py
+++ b/src/mlia/target/tosa/events.py
@@ -6,7 +6,7 @@ from pathlib import Path
 
 from mlia.core.events import Event
 from mlia.core.events import EventDispatcher
-from mlia.devices.tosa.config import TOSAConfiguration
+from mlia.target.tosa.config import TOSAConfiguration
 
 
 @dataclass
diff --git a/src/mlia/devices/tosa/handlers.py b/src/mlia/target/tosa/handlers.py
index fc82657..863558c 100644
--- a/src/mlia/devices/tosa/handlers.py
+++ b/src/mlia/target/tosa/handlers.py
@@ -10,9 +10,9 @@ from mlia.backend.tosa_checker.compat import TOSACompatibilityInfo
 from mlia.core.events import CollectedDataEvent
 from mlia.core.handlers import WorkflowEventsHandler
 from mlia.core.typing import PathOrFileLike
-from mlia.devices.tosa.events import TOSAAdvisorEventHandler
-from mlia.devices.tosa.events import TOSAAdvisorStartedEvent
-from mlia.devices.tosa.reporters import tosa_formatters
+from mlia.target.tosa.events import TOSAAdvisorEventHandler
+from mlia.target.tosa.events import TOSAAdvisorStartedEvent
+from mlia.target.tosa.reporters import tosa_formatters
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/mlia/devices/tosa/operators.py b/src/mlia/target/tosa/operators.py
index b75ceb0..b75ceb0 100644
--- a/src/mlia/devices/tosa/operators.py
+++ b/src/mlia/target/tosa/operators.py
diff --git a/src/mlia/devices/tosa/reporters.py b/src/mlia/target/tosa/reporters.py
index e5559ee..01fbb97 100644
--- a/src/mlia/devices/tosa/reporters.py
+++ b/src/mlia/target/tosa/reporters.py
@@ -16,7 +16,7 @@ from mlia.core.reporting import NestedReport
 from mlia.core.reporting import Report
 from mlia.core.reporting import ReportItem
 from mlia.core.reporting import Table
-from mlia.devices.tosa.config import TOSAConfiguration
+from mlia.target.tosa.config import TOSAConfiguration
 from mlia.utils.console import style_improvement
 from mlia.utils.types import is_list_of
 
diff --git a/tests/conftest.py b/tests/conftest.py
index feb2aa0..e27acaf 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -12,10 +12,10 @@ import tensorflow as tf
 
 from mlia.backend.vela.compiler import optimize_model
 from mlia.core.context import ExecutionContext
-from mlia.devices.ethosu.config import EthosUConfiguration
 from mlia.nn.tensorflow.utils import convert_to_tflite
 from mlia.nn.tensorflow.utils import save_keras_model
 from mlia.nn.tensorflow.utils import save_tflite_model
+from mlia.target.ethos_u.config import EthosUConfiguration
 
 
 @pytest.fixture(scope="session", name="test_resources_path")
diff --git a/tests/test_api.py b/tests/test_api.py
index b9ab8ea..fbc558b 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -15,8 +15,8 @@ from mlia.api import get_advisor
 from mlia.core.common import AdviceCategory
 from mlia.core.context import Context
 from mlia.core.context import ExecutionContext
-from mlia.devices.ethosu.advisor import EthosUInferenceAdvisor
-from mlia.devices.tosa.advisor import TOSAInferenceAdvisor
+from mlia.target.ethos_u.advisor import EthosUInferenceAdvisor
+from mlia.target.tosa.advisor import TOSAInferenceAdvisor
 
 
 def test_get_advice_no_target_provided(test_keras_model: Path) -> None:
@@ -118,12 +118,12 @@ def test_get_advisor(
     [
         [
             "ethos-u55-128",
-            "mlia.devices.ethosu.operators.generate_supported_operators_report",
+            "mlia.target.ethos_u.operators.generate_supported_operators_report",
             None,
         ],
         [
             "ethos-u65-256",
-            "mlia.devices.ethosu.operators.generate_supported_operators_report",
+            "mlia.target.ethos_u.operators.generate_supported_operators_report",
             None,
         ],
         [
diff --git a/tests/test_backend_vela_compat.py b/tests/test_backend_vela_compat.py
index 6f7a41c..a2e7f90 100644
--- a/tests/test_backend_vela_compat.py
+++ b/tests/test_backend_vela_compat.py
@@ -10,7 +10,7 @@ from mlia.backend.vela.compat import NpuSupported
 from mlia.backend.vela.compat import Operator
 from mlia.backend.vela.compat import Operators
 from mlia.backend.vela.compat import supported_operators
-from mlia.devices.ethosu.config import EthosUConfiguration
+from mlia.target.ethos_u.config import EthosUConfiguration
 from mlia.utils.filesystem import working_directory
 
 
diff --git a/tests/test_backend_vela_compiler.py b/tests/test_backend_vela_compiler.py
index 40268ae..ff07c74 100644
--- a/tests/test_backend_vela_compiler.py
+++ b/tests/test_backend_vela_compiler.py
@@ -10,7 +10,7 @@ from mlia.backend.vela.compiler import optimize_model
 from mlia.backend.vela.compiler import OptimizedModel
 from mlia.backend.vela.compiler import VelaCompiler
 from mlia.backend.vela.compiler import VelaCompilerOptions
-from mlia.devices.ethosu.config import EthosUConfiguration
+from mlia.target.ethos_u.config import EthosUConfiguration
 
 
 def test_default_vela_compiler() -> None:
diff --git a/tests/test_backend_vela_performance.py b/tests/test_backend_vela_performance.py
index a1c806c..34c11ab 100644
--- a/tests/test_backend_vela_performance.py
+++ b/tests/test_backend_vela_performance.py
@@ -9,7 +9,7 @@ import pytest
 from mlia.backend.vela.compiler import optimize_model
 from mlia.backend.vela.performance import estimate_performance
 from mlia.backend.vela.performance import PerformanceMetrics
-from mlia.devices.ethosu.config import EthosUConfiguration
+from mlia.target.ethos_u.config import EthosUConfiguration
 
 
 def test_estimate_performance(test_tflite_model: Path) -> None:
diff --git a/tests/test_cli_commands.py b/tests/test_cli_commands.py
index 77e1f88..aed5c42 100644
--- a/tests/test_cli_commands.py
+++ b/tests/test_cli_commands.py
@@ -18,10 +18,10 @@ from mlia.cli.commands import operators
 from mlia.cli.commands import optimization
 from mlia.cli.commands import performance
 from mlia.core.context import ExecutionContext
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.performance import MemoryUsage
-from mlia.devices.ethosu.performance import NPUCycles
-from mlia.devices.ethosu.performance import PerformanceMetrics
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.performance import MemoryUsage
+from mlia.target.ethos_u.performance import NPUCycles
+from mlia.target.ethos_u.performance import PerformanceMetrics
 
 
 def test_operators_expected_parameters(sample_context: ExecutionContext) -> None:
@@ -133,7 +133,7 @@ def mock_performance_estimation(monkeypatch: pytest.MonkeyPatch) -> None:
         MemoryUsage(1, 2, 3, 4, 5),
     )
     monkeypatch.setattr(
-        "mlia.devices.ethosu.data_collection.EthosUPerformanceEstimator.estimate",
+        "mlia.target.ethos_u.data_collection.EthosUPerformanceEstimator.estimate",
         MagicMock(return_value=metrics),
     )
 
diff --git a/tests/test_devices_cortexa_advice_generation.py b/tests/test_target_cortex_a_advice_generation.py
index fd669d4..02a2b14 100644
--- a/tests/test_devices_cortexa_advice_generation.py
+++ b/tests/test_target_cortex_a_advice_generation.py
@@ -9,14 +9,14 @@ from mlia.core.advice_generation import Advice
 from mlia.core.common import AdviceCategory
 from mlia.core.common import DataItem
 from mlia.core.context import ExecutionContext
-from mlia.devices.cortexa.advice_generation import CortexAAdviceProducer
-from mlia.devices.cortexa.data_analysis import ModelHasCustomOperators
-from mlia.devices.cortexa.data_analysis import ModelIsCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotTFLiteCompatible
-from mlia.devices.cortexa.data_analysis import TFLiteCompatibilityCheckFailed
-from mlia.devices.cortexa.operator_compatibility import ARMNN_TFLITE_DELEGATE
 from mlia.nn.tensorflow.tflite_graph import TFL_ACTIVATION_FUNCTION
+from mlia.target.cortex_a.advice_generation import CortexAAdviceProducer
+from mlia.target.cortex_a.data_analysis import ModelHasCustomOperators
+from mlia.target.cortex_a.data_analysis import ModelIsCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotTFLiteCompatible
+from mlia.target.cortex_a.data_analysis import TFLiteCompatibilityCheckFailed
+from mlia.target.cortex_a.operator_compatibility import ARMNN_TFLITE_DELEGATE
 
 BACKEND_INFO = (
     f"{ARMNN_TFLITE_DELEGATE['metadata']['backend']} "
diff --git a/tests/test_devices_cortexa_advisor.py b/tests/test_target_cortex_a_advisor.py
index 8cd60d6..1788a6d 100644
--- a/tests/test_devices_cortexa_advisor.py
+++ b/tests/test_target_cortex_a_advisor.py
@@ -5,8 +5,8 @@ from pathlib import Path
 
 from mlia.core.context import ExecutionContext
 from mlia.core.workflow import DefaultWorkflowExecutor
-from mlia.devices.cortexa.advisor import configure_and_get_cortexa_advisor
-from mlia.devices.cortexa.advisor import CortexAInferenceAdvisor
+from mlia.target.cortex_a.advisor import configure_and_get_cortexa_advisor
+from mlia.target.cortex_a.advisor import CortexAInferenceAdvisor
 
 
 def test_advisor_metadata() -> None:
diff --git a/tests/test_devices_cortexa_data_analysis.py b/tests/test_target_cortex_a_data_analysis.py
index ed30b9a..b223b01 100644
--- a/tests/test_devices_cortexa_data_analysis.py
+++ b/tests/test_target_cortex_a_data_analysis.py
@@ -7,20 +7,20 @@ import pytest
 
 from mlia.core.common import DataItem
 from mlia.core.data_analysis import Fact
-from mlia.devices.cortexa.data_analysis import CortexADataAnalyzer
-from mlia.devices.cortexa.data_analysis import ModelHasCustomOperators
-from mlia.devices.cortexa.data_analysis import ModelIsCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotTFLiteCompatible
-from mlia.devices.cortexa.data_analysis import TFLiteCompatibilityCheckFailed
-from mlia.devices.cortexa.operator_compatibility import ARMNN_TFLITE_DELEGATE
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
-from mlia.devices.cortexa.operators import Operator
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityStatus
 from mlia.nn.tensorflow.tflite_compat import TFLiteConversionError
 from mlia.nn.tensorflow.tflite_compat import TFLiteConversionErrorCode
 from mlia.nn.tensorflow.tflite_graph import TFL_ACTIVATION_FUNCTION
+from mlia.target.cortex_a.data_analysis import CortexADataAnalyzer
+from mlia.target.cortex_a.data_analysis import ModelHasCustomOperators
+from mlia.target.cortex_a.data_analysis import ModelIsCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotTFLiteCompatible
+from mlia.target.cortex_a.data_analysis import TFLiteCompatibilityCheckFailed
+from mlia.target.cortex_a.operator_compatibility import ARMNN_TFLITE_DELEGATE
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.operators import Operator
 
 BACKEND_INFO = (
     f"{ARMNN_TFLITE_DELEGATE['metadata']['backend']} "
diff --git a/tests/test_devices_cortexa_data_collection.py b/tests/test_target_cortex_a_data_collection.py
index 6d3b2ac..7504166 100644
--- a/tests/test_devices_cortexa_data_collection.py
+++ b/tests/test_target_cortex_a_data_collection.py
@@ -7,8 +7,8 @@ from unittest.mock import MagicMock
 import pytest
 
 from mlia.core.context import ExecutionContext
-from mlia.devices.cortexa.data_collection import CortexAOperatorCompatibility
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.data_collection import CortexAOperatorCompatibility
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
 
 
 def check_cortex_a_data_collection(
@@ -18,7 +18,7 @@ def check_cortex_a_data_collection(
     assert CortexAOperatorCompatibility.name()
 
     monkeypatch.setattr(
-        "mlia.devices.cortexa.data_collection.get_cortex_a_compatibility_info",
+        "mlia.target.cortex_a.data_collection.get_cortex_a_compatibility_info",
         MagicMock(return_value=CortexACompatibilityInfo(True, [])),
     )
 
diff --git a/tests/test_devices_cortexa_operators.py b/tests/test_target_cortex_a_operators.py
index 23c4b0a..94eb890 100644
--- a/tests/test_devices_cortexa_operators.py
+++ b/tests/test_target_cortex_a_operators.py
@@ -6,12 +6,12 @@ from pathlib import Path
 import pytest
 import tensorflow as tf
 
-from mlia.devices.cortexa import operator_compatibility as op_compat
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
-from mlia.devices.cortexa.operators import get_cortex_a_compatibility_info
-from mlia.devices.cortexa.operators import Operator
 from mlia.nn.tensorflow.tflite_graph import TFL_OP
 from mlia.nn.tensorflow.utils import convert_to_tflite
+from mlia.target.cortex_a import operator_compatibility as op_compat
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.operators import get_cortex_a_compatibility_info
+from mlia.target.cortex_a.operators import Operator
 
 
 def test_op_compat_data() -> None:
diff --git a/tests/test_devices_cortexa_reporters.py b/tests/test_target_cortex_a_reporters.py
index 1110653..4b39aa1 100644
--- a/tests/test_devices_cortexa_reporters.py
+++ b/tests/test_target_cortex_a_reporters.py
@@ -7,13 +7,13 @@ import pytest
 
 from mlia.core.advice_generation import Advice
 from mlia.core.reporting import Report
-from mlia.devices.cortexa.config import CortexAConfiguration
-from mlia.devices.cortexa.operators import Operator
-from mlia.devices.cortexa.reporters import cortex_a_formatters
-from mlia.devices.cortexa.reporters import report_device
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityStatus
 from mlia.nn.tensorflow.tflite_graph import TFL_ACTIVATION_FUNCTION
+from mlia.target.cortex_a.config import CortexAConfiguration
+from mlia.target.cortex_a.operators import Operator
+from mlia.target.cortex_a.reporters import cortex_a_formatters
+from mlia.target.cortex_a.reporters import report_device
 
 
 def test_report_device() -> None:
diff --git a/tests/test_devices_ethosu_advice_generation.py b/tests/test_target_ethos_u_advice_generation.py
index 21a3667..1569592 100644
--- a/tests/test_devices_ethosu_advice_generation.py
+++ b/tests/test_target_ethos_u_advice_generation.py
@@ -12,15 +12,15 @@ from mlia.core.common import DataItem
 from mlia.core.context import ExecutionContext
 from mlia.core.helpers import ActionResolver
 from mlia.core.helpers import APIActionResolver
-from mlia.devices.ethosu.advice_generation import EthosUAdviceProducer
-from mlia.devices.ethosu.advice_generation import EthosUStaticAdviceProducer
-from mlia.devices.ethosu.data_analysis import AllOperatorsSupportedOnNPU
-from mlia.devices.ethosu.data_analysis import HasCPUOnlyOperators
-from mlia.devices.ethosu.data_analysis import HasUnsupportedOnNPUOperators
-from mlia.devices.ethosu.data_analysis import OptimizationDiff
-from mlia.devices.ethosu.data_analysis import OptimizationResults
-from mlia.devices.ethosu.data_analysis import PerfMetricDiff
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.advice_generation import EthosUAdviceProducer
+from mlia.target.ethos_u.advice_generation import EthosUStaticAdviceProducer
+from mlia.target.ethos_u.data_analysis import AllOperatorsSupportedOnNPU
+from mlia.target.ethos_u.data_analysis import HasCPUOnlyOperators
+from mlia.target.ethos_u.data_analysis import HasUnsupportedOnNPUOperators
+from mlia.target.ethos_u.data_analysis import OptimizationDiff
+from mlia.target.ethos_u.data_analysis import OptimizationResults
+from mlia.target.ethos_u.data_analysis import PerfMetricDiff
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_devices_ethosu_advisor.py b/tests/test_target_ethos_u_advisor.py
index 74d2408..fb68800 100644
--- a/tests/test_devices_ethosu_advisor.py
+++ b/tests/test_target_ethos_u_advisor.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
 """Tests for Ethos-U MLIA module."""
-from mlia.devices.ethosu.advisor import EthosUInferenceAdvisor
+from mlia.target.ethos_u.advisor import EthosUInferenceAdvisor
 
 
 def test_advisor_metadata() -> None:
diff --git a/tests/test_devices_ethosu_config.py b/tests/test_target_ethos_u_config.py
index 2fec0d5..6ccd5ce 100644
--- a/tests/test_devices_ethosu_config.py
+++ b/tests/test_target_ethos_u_config.py
@@ -10,8 +10,8 @@ from unittest.mock import MagicMock
 import pytest
 
 from mlia.backend.vela.compiler import VelaCompilerOptions
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.config import get_target
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.config import get_target
 from mlia.utils.filesystem import get_vela_config
 
 
@@ -118,7 +118,7 @@ def test_ethosu_configuration(
 ) -> None:
     """Test creating Ethos-U configuration."""
     monkeypatch.setattr(
-        "mlia.devices.ethosu.config.get_profile", MagicMock(return_value=profile_data)
+        "mlia.target.ethos_u.config.get_profile", MagicMock(return_value=profile_data)
     )
 
     with expected_error:
diff --git a/tests/test_devices_ethosu_data_analysis.py b/tests/test_target_ethos_u_data_analysis.py
index 8184c70..bac27ad 100644
--- a/tests/test_devices_ethosu_data_analysis.py
+++ b/tests/test_target_ethos_u_data_analysis.py
@@ -10,19 +10,19 @@ from mlia.backend.vela.compat import Operator
 from mlia.backend.vela.compat import Operators
 from mlia.core.common import DataItem
 from mlia.core.data_analysis import Fact
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.data_analysis import AllOperatorsSupportedOnNPU
-from mlia.devices.ethosu.data_analysis import EthosUDataAnalyzer
-from mlia.devices.ethosu.data_analysis import HasCPUOnlyOperators
-from mlia.devices.ethosu.data_analysis import HasUnsupportedOnNPUOperators
-from mlia.devices.ethosu.data_analysis import OptimizationDiff
-from mlia.devices.ethosu.data_analysis import OptimizationResults
-from mlia.devices.ethosu.data_analysis import PerfMetricDiff
-from mlia.devices.ethosu.performance import MemoryUsage
-from mlia.devices.ethosu.performance import NPUCycles
-from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics
-from mlia.devices.ethosu.performance import PerformanceMetrics
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.data_analysis import AllOperatorsSupportedOnNPU
+from mlia.target.ethos_u.data_analysis import EthosUDataAnalyzer
+from mlia.target.ethos_u.data_analysis import HasCPUOnlyOperators
+from mlia.target.ethos_u.data_analysis import HasUnsupportedOnNPUOperators
+from mlia.target.ethos_u.data_analysis import OptimizationDiff
+from mlia.target.ethos_u.data_analysis import OptimizationResults
+from mlia.target.ethos_u.data_analysis import PerfMetricDiff
+from mlia.target.ethos_u.performance import MemoryUsage
+from mlia.target.ethos_u.performance import NPUCycles
+from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics
+from mlia.target.ethos_u.performance import PerformanceMetrics
 
 
 def test_perf_metrics_diff() -> None:
diff --git a/tests/test_devices_ethosu_data_collection.py b/tests/test_target_ethos_u_data_collection.py
index 84b9424..2cf7482 100644
--- a/tests/test_devices_ethosu_data_collection.py
+++ b/tests/test_target_ethos_u_data_collection.py
@@ -10,15 +10,15 @@ from mlia.backend.vela.compat import Operators
 from mlia.core.context import Context
 from mlia.core.data_collection import DataCollector
 from mlia.core.errors import FunctionalityNotSupportedError
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.data_collection import EthosUOperatorCompatibility
-from mlia.devices.ethosu.data_collection import EthosUOptimizationPerformance
-from mlia.devices.ethosu.data_collection import EthosUPerformance
-from mlia.devices.ethosu.performance import MemoryUsage
-from mlia.devices.ethosu.performance import NPUCycles
-from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics
-from mlia.devices.ethosu.performance import PerformanceMetrics
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.data_collection import EthosUOperatorCompatibility
+from mlia.target.ethos_u.data_collection import EthosUOptimizationPerformance
+from mlia.target.ethos_u.data_collection import EthosUPerformance
+from mlia.target.ethos_u.performance import MemoryUsage
+from mlia.target.ethos_u.performance import NPUCycles
+from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics
+from mlia.target.ethos_u.performance import PerformanceMetrics
 
 
 @pytest.mark.parametrize(
@@ -146,6 +146,6 @@ def mock_performance_estimation(
         MemoryUsage(1, 2, 3, 4, 5),
     )
     monkeypatch.setattr(
-        "mlia.devices.ethosu.data_collection.EthosUPerformanceEstimator.estimate",
+        "mlia.target.ethos_u.data_collection.EthosUPerformanceEstimator.estimate",
         MagicMock(return_value=metrics),
     )
diff --git a/tests/test_devices_ethosu_performance.py b/tests/test_target_ethos_u_performance.py
index 3ff73d8..76860b5 100644
--- a/tests/test_devices_ethosu_performance.py
+++ b/tests/test_target_ethos_u_performance.py
@@ -5,8 +5,8 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from mlia.devices.ethosu.performance import MemorySizeType
-from mlia.devices.ethosu.performance import MemoryUsage
+from mlia.target.ethos_u.performance import MemorySizeType
+from mlia.target.ethos_u.performance import MemoryUsage
 
 
 def test_memory_usage_conversion() -> None:
diff --git a/tests/test_devices_ethosu_reporters.py b/tests/test_target_ethos_u_reporters.py
index 926c4c3..7f372bf 100644
--- a/tests/test_devices_ethosu_reporters.py
+++ b/tests/test_target_ethos_u_reporters.py
@@ -21,14 +21,14 @@ from mlia.core.reporting import produce_report
 from mlia.core.reporting import Report
 from mlia.core.reporting import Reporter
 from mlia.core.reporting import Table
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.performance import MemoryUsage
-from mlia.devices.ethosu.performance import NPUCycles
-from mlia.devices.ethosu.performance import PerformanceMetrics
-from mlia.devices.ethosu.reporters import ethos_u_formatters
-from mlia.devices.ethosu.reporters import report_device_details
-from mlia.devices.ethosu.reporters import report_operators
-from mlia.devices.ethosu.reporters import report_perf_metrics
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.performance import MemoryUsage
+from mlia.target.ethos_u.performance import NPUCycles
+from mlia.target.ethos_u.performance import PerformanceMetrics
+from mlia.target.ethos_u.reporters import ethos_u_formatters
+from mlia.target.ethos_u.reporters import report_device_details
+from mlia.target.ethos_u.reporters import report_operators
+from mlia.target.ethos_u.reporters import report_perf_metrics
 from mlia.utils.console import remove_ascii_codes
 
 
diff --git a/tests/test_devices_tosa_advice_generation.py b/tests/test_target_tosa_advice_generation.py
index 1b97c8b..e8e06f8 100644
--- a/tests/test_devices_tosa_advice_generation.py
+++ b/tests/test_target_tosa_advice_generation.py
@@ -9,9 +9,9 @@ from mlia.core.advice_generation import Advice
 from mlia.core.common import AdviceCategory
 from mlia.core.common import DataItem
 from mlia.core.context import ExecutionContext
-from mlia.devices.tosa.advice_generation import TOSAAdviceProducer
-from mlia.devices.tosa.data_analysis import ModelIsNotTOSACompatible
-from mlia.devices.tosa.data_analysis import ModelIsTOSACompatible
+from mlia.target.tosa.advice_generation import TOSAAdviceProducer
+from mlia.target.tosa.data_analysis import ModelIsNotTOSACompatible
+from mlia.target.tosa.data_analysis import ModelIsTOSACompatible
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_devices_tosa_advisor.py b/tests/test_target_tosa_advisor.py
index 1c7a31a..32a6b77 100644
--- a/tests/test_devices_tosa_advisor.py
+++ b/tests/test_target_tosa_advisor.py
@@ -5,8 +5,8 @@ from pathlib import Path
 
 from mlia.core.context import ExecutionContext
 from mlia.core.workflow import DefaultWorkflowExecutor
-from mlia.devices.tosa.advisor import configure_and_get_tosa_advisor
-from mlia.devices.tosa.advisor import TOSAInferenceAdvisor
+from mlia.target.tosa.advisor import configure_and_get_tosa_advisor
+from mlia.target.tosa.advisor import TOSAInferenceAdvisor
 
 
 def test_configure_and_get_tosa_advisor(test_tflite_model: Path) -> None:
diff --git a/tests/test_devices_tosa_data_analysis.py b/tests/test_target_tosa_data_analysis.py
index f2da691..41e977f 100644
--- a/tests/test_devices_tosa_data_analysis.py
+++ b/tests/test_target_tosa_data_analysis.py
@@ -8,9 +8,9 @@ import pytest
 from mlia.backend.tosa_checker.compat import TOSACompatibilityInfo
 from mlia.core.common import DataItem
 from mlia.core.data_analysis import Fact
-from mlia.devices.tosa.data_analysis import ModelIsNotTOSACompatible
-from mlia.devices.tosa.data_analysis import ModelIsTOSACompatible
-from mlia.devices.tosa.data_analysis import TOSADataAnalyzer
+from mlia.target.tosa.data_analysis import ModelIsNotTOSACompatible
+from mlia.target.tosa.data_analysis import ModelIsTOSACompatible
+from mlia.target.tosa.data_analysis import TOSADataAnalyzer
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_devices_tosa_data_collection.py b/tests/test_target_tosa_data_collection.py
index 0c1eda1..9d590ca 100644
--- a/tests/test_devices_tosa_data_collection.py
+++ b/tests/test_target_tosa_data_collection.py
@@ -8,7 +8,7 @@ import pytest
 
 from mlia.backend.tosa_checker.compat import TOSACompatibilityInfo
 from mlia.core.context import ExecutionContext
-from mlia.devices.tosa.data_collection import TOSAOperatorCompatibility
+from mlia.target.tosa.data_collection import TOSAOperatorCompatibility
 
 
 def test_tosa_data_collection(
@@ -16,7 +16,7 @@ def test_tosa_data_collection(
 ) -> None:
     """Test TOSA data collection."""
     monkeypatch.setattr(
-        "mlia.devices.tosa.data_collection.get_tosa_compatibility_info",
+        "mlia.target.tosa.data_collection.get_tosa_compatibility_info",
         MagicMock(return_value=TOSACompatibilityInfo(True, [])),
     )
     context = ExecutionContext(working_dir=tmpdir)
diff --git a/tests/test_mlia_utils_py_manager.py b/tests/test_utils_py_manager.py
index e41680d..e41680d 100644
--- a/tests/test_mlia_utils_py_manager.py
+++ b/tests/test_utils_py_manager.py