diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index d48aa25f5bb..90c9aa11d17 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -241,7 +241,7 @@ jobs: . $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_DIR)/tests/mo/unit_tests --junitxml=TEST-ModelOptimizer.xml displayName: 'Model Optimizer UT' continueOnError: false - enabled: false + enabled: true - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ov_core_unit_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:TEST-NGraphUT.xml workingDirectory: $(INSTALL_TEST_DIR) @@ -334,7 +334,7 @@ jobs: displayName: 'Samples Smoke Tests' continueOnError: false condition: eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'ON') - enabled: false + enabled: true - script: | export DATA_PATH=$(MODELS_PATH) @@ -353,7 +353,7 @@ jobs: workingDirectory: $(LAYER_TESTS_DIR) displayName: 'Layer Tests' continueOnError: false - enabled: false + enabled: true - task: PublishTestResults@2 condition: always() diff --git a/docs/HOWTO/mo_extensions/front/tf/Complex.py b/docs/HOWTO/mo_extensions/front/tf/Complex.py index fa23d9b1f4d..60167aad6c0 100644 --- a/docs/HOWTO/mo_extensions/front/tf/Complex.py +++ b/docs/HOWTO/mo_extensions/front/tf/Complex.py @@ -2,12 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 #! [complex:transformation] -import logging as log -import numpy as np - -from mo.front.common.replacement import FrontReplacementSubgraph -from mo.graph.graph import Graph +from openvino.tools.mo.front.common.replacement import FrontReplacementSubgraph +from openvino.tools.mo.graph.graph import Graph class Complex(FrontReplacementSubgraph): @@ -41,4 +38,3 @@ class Complex(FrontReplacementSubgraph): # change the connection so now all consumers of "complex_node" get data from input node of strided slice nodes complex_node.out_port(0).get_connection().set_source(input_node_output_port) #! [complex:transformation] - diff --git a/docs/HOWTO/mo_extensions/front/tf/ComplexAbs.py b/docs/HOWTO/mo_extensions/front/tf/ComplexAbs.py index 4fe0368fd66..ea6c94ed1e2 100644 --- a/docs/HOWTO/mo_extensions/front/tf/ComplexAbs.py +++ b/docs/HOWTO/mo_extensions/front/tf/ComplexAbs.py @@ -4,11 +4,11 @@ #! [complex_abs:transformation] import numpy as np -from extensions.ops.elementwise import Pow -from extensions.ops.ReduceOps import ReduceSum -from mo.front.common.replacement import FrontReplacementOp -from mo.graph.graph import Graph, Node -from mo.ops.const import Const +from openvino.tools.mo.ops.elementwise import Pow +from openvino.tools.mo.ops.ReduceOps import ReduceSum +from openvino.tools.mo.front.common.replacement import FrontReplacementOp +from openvino.tools.mo.graph.graph import Graph, Node +from openvino.tools.mo.ops.const import Const class ComplexAbs(FrontReplacementOp): diff --git a/docs/HOWTO/mo_extensions/front/tf/FFT_ext.py b/docs/HOWTO/mo_extensions/front/tf/FFT_ext.py index e5216d2ea3e..c15c4e38903 100644 --- a/docs/HOWTO/mo_extensions/front/tf/FFT_ext.py +++ b/docs/HOWTO/mo_extensions/front/tf/FFT_ext.py @@ -3,8 +3,7 @@ # ! [fft_ext:extractor] from ...ops.FFT import FFT -from mo.front.extractor import FrontExtractorOp -from mo.utils.error import Error +from openvino.tools.mo.front.extractor import FrontExtractorOp class FFT2DFrontExtractor(FrontExtractorOp): diff --git a/docs/HOWTO/mo_extensions/ops/FFT.py b/docs/HOWTO/mo_extensions/ops/FFT.py index 92645cd6967..e0f018fa165 100644 --- a/docs/HOWTO/mo_extensions/ops/FFT.py +++ b/docs/HOWTO/mo_extensions/ops/FFT.py @@ -2,9 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 #! [fft:operation] -from mo.front.common.partial_infer.elemental import copy_shape_infer -from mo.graph.graph import Node, Graph -from mo.ops.op import Op +from openvino.tools.mo.front.common.partial_infer.elemental import copy_shape_infer +from openvino.tools.mo.graph.graph import Graph +from openvino.tools.mo.ops.op import Op class FFT(Op): diff --git a/docs/MO_DG/prepare_model/customize_model_optimizer/Customize_Model_Optimizer.md b/docs/MO_DG/prepare_model/customize_model_optimizer/Customize_Model_Optimizer.md index d133654b8df..d29b2edeb6c 100644 --- a/docs/MO_DG/prepare_model/customize_model_optimizer/Customize_Model_Optimizer.md +++ b/docs/MO_DG/prepare_model/customize_model_optimizer/Customize_Model_Optimizer.md @@ -639,9 +639,9 @@ graph. Consider the extractor for the TensorFlow\* operation `Const` (refer to t `extensions/front/tf/const_ext.py`): ```py -from mo.front.extractor import FrontExtractorOp -from mo.front.tf.extractors.utils import tf_dtype_extractor, tf_tensor_shape, tf_tensor_content -from mo.ops.const import Const +from openvino.tools.mo.front.extractor import FrontExtractorOp +from openvino.tools.mo.front.tf.extractors.utils import tf_dtype_extractor, tf_tensor_shape, tf_tensor_content +from openvino.tools.mo.ops.const import Const class ConstExtractor(FrontExtractorOp): @@ -679,9 +679,9 @@ Consider another example with an extractor of ONNX\* operation `Constant` (refer from onnx import numpy_helper from onnx.numpy_helper import to_array -from mo.front.extractor import FrontExtractorOp -from mo.front.onnx.extractors.utils import onnx_attr -from mo.ops.const import Const +from openvino.tools.mo.front.extractor import FrontExtractorOp +from openvino.tools.mo.front.onnx.extractors.utils import onnx_attr +from openvino.tools.mo.ops.const import Const class ConstantExtractor(FrontExtractorOp): @@ -814,11 +814,11 @@ fusing of the sub-graph defining the [Mish](../../../ops/activation/Mish_4.md) a operation: ```py -from extensions.front.Softplus_fusion import SoftplusFusion -from extensions.ops.activation_ops import Mish -from mo.front.common.replacement import FrontReplacementSubgraph -from mo.front.subgraph_matcher import SubgraphMatch -from mo.graph.graph import Graph, rename_nodes +from openvino.tools.mo.front.Softplus_fusion import SoftplusFusion +from openvino.tools.mo.ops.activation_ops import Mish +from openvino.tools.mo.front.common.replacement import FrontReplacementSubgraph +from openvino.tools.mo.front.subgraph_matcher import SubgraphMatch +from openvino.tools.mo.graph.graph import Graph, rename_nodes class MishFusion(FrontReplacementSubgraph): @@ -886,12 +886,12 @@ transformation. Consider an example transformation from the file is `extensions/front/Pack.py` which replaces operation `Pack` from the TensorFlow\*: ```py -from mo.front.common.partial_infer.utils import int64_array -from mo.front.common.replacement import FrontReplacementOp -from mo.front.tf.graph_utils import create_op_with_const_inputs -from mo.graph.graph import Node, Graph, rename_nodes -from mo.ops.concat import Concat -from mo.ops.unsqueeze import Unsqueeze +from openvino.tools.mo.front.common.partial_infer.utils import int64_array +from openvino.tools.mo.front.common.replacement import FrontReplacementOp +from openvino.tools.mo.front.tf.graph_utils import create_op_with_const_inputs +from openvino.tools.mo.graph.graph import Node, Graph, rename_nodes +from openvino.tools.mo.ops.concat import Concat +from openvino.tools.mo.ops.unsqueeze import Unsqueeze class Pack(FrontReplacementOp): @@ -932,11 +932,11 @@ specification. ```py import logging as log -from mo.front.common.partial_infer.utils import int64_array -from mo.front.common.replacement import FrontReplacementPattern -from mo.graph.graph import Graph -from mo.ops.const import Const -from mo.utils.error import Error +from openvino.tools.mo.front.common.partial_infer.utils import int64_array +from openvino.tools.mo.front.common.replacement import FrontReplacementPattern +from openvino.tools.mo.graph.graph import Graph +from openvino.tools.mo.ops.const import Const +from openvino.tools.mo.utils.error import Error class SqueezeNormalize(FrontReplacementPattern): @@ -1200,13 +1200,13 @@ The example of the configuration file for this type of transformation is `extens and the corresponding transformation file is `./extensions/front/YOLO.py`: ```py -from extensions.front.no_op_eraser import NoOpEraser -from extensions.front.standalone_const_eraser import StandaloneConstEraser -from extensions.ops.regionyolo import RegionYoloOp -from mo.front.tf.replacement import FrontReplacementFromConfigFileGeneral -from mo.graph.graph import Node, Graph -from mo.ops.result import Result -from mo.utils.error import Error +from openvino.tools.mo.front.no_op_eraser import NoOpEraser +from openvino.tools.mo.front.standalone_const_eraser import StandaloneConstEraser +from openvino.tools.mo.ops.regionyolo import RegionYoloOp +from openvino.tools.mo.front.tf.replacement import FrontReplacementFromConfigFileGeneral +from openvino.tools.mo.graph.graph import Node, Graph +from openvino.tools.mo.ops.result import Result +from openvino.tools.mo.utils.error import Error class YoloRegionAddon(FrontReplacementFromConfigFileGeneral): diff --git a/docs/MO_DG/prepare_model/customize_model_optimizer/Extending_MXNet_Model_Optimizer_with_New_Primitives.md b/docs/MO_DG/prepare_model/customize_model_optimizer/Extending_MXNet_Model_Optimizer_with_New_Primitives.md index e20a44969cf..9c4774715e4 100644 --- a/docs/MO_DG/prepare_model/customize_model_optimizer/Extending_MXNet_Model_Optimizer_with_New_Primitives.md +++ b/docs/MO_DG/prepare_model/customize_model_optimizer/Extending_MXNet_Model_Optimizer_with_New_Primitives.md @@ -20,9 +20,9 @@ assume that we have already created the `CustomOp` class (inherited from `Op` cl for this MXNet custom operation as described in the [Customize_Model_Optimizer](Customize_Model_Optimizer.md). ```py -from extension.ops.custom_op import CustomOp # implementation of the MO operation class -from mo.front.mxnet.extractors.utils import get_mxnet_layer_attrs -from mo.front.extractor import MXNetCustomFrontExtractorOp +from openvino.tools.mo.ops.custom_op import CustomOp # implementation of the MO operation class +from openvino.tools.mo.front.mxnet.extractors.utils import get_mxnet_layer_attrs +from openvino.tools.mo.front.extractor import MXNetCustomFrontExtractorOp class CustomProposalFrontExtractor(MXNetCustomFrontExtractorOp): # inherit from specific base class op = 'MyCustomOp' # the value corresponding to the `op_type` value of the MXNet operation diff --git a/docs/MO_DG/prepare_model/customize_model_optimizer/Extending_Model_Optimizer_with_Caffe_Python_Layers.md b/docs/MO_DG/prepare_model/customize_model_optimizer/Extending_Model_Optimizer_with_Caffe_Python_Layers.md index 579437aeb5a..f95fae23e2b 100644 --- a/docs/MO_DG/prepare_model/customize_model_optimizer/Extending_Model_Optimizer_with_Caffe_Python_Layers.md +++ b/docs/MO_DG/prepare_model/customize_model_optimizer/Extending_Model_Optimizer_with_Caffe_Python_Layers.md @@ -40,8 +40,8 @@ operation `ProposalOp` which corresponds to `Proposal` operation described in th document. Refer to the source code below for a detailed explanation of the extractor. ```py -from extensions.ops.proposal import ProposalOp -from mo.front.extractor import CaffePythonFrontExtractorOp +from openvino.tools.mo.ops.proposal import ProposalOp +from openvino.tools.mo.front.extractor import CaffePythonFrontExtractorOp class ProposalPythonFrontExtractor(CaffePythonFrontExtractorOp): diff --git a/tools/mo/unit_tests/extensions/back/__init__.py b/tools/mo/unit_tests/extensions/back/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/front/__init__.py b/tools/mo/unit_tests/extensions/front/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/front/caffe/__init__.py b/tools/mo/unit_tests/extensions/front/caffe/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/front/kaldi/__init__.py b/tools/mo/unit_tests/extensions/front/kaldi/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/front/mxnet/__init__.py b/tools/mo/unit_tests/extensions/front/mxnet/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/front/onnx/__init__.py b/tools/mo/unit_tests/extensions/front/onnx/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/front/tf/__init__.py b/tools/mo/unit_tests/extensions/front/tf/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/middle/__init__.py b/tools/mo/unit_tests/extensions/middle/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/ops/__init__.py b/tools/mo/unit_tests/extensions/ops/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tools/mo/unit_tests/extensions/analysis/Iterator_get_next_test.py b/tools/mo/unit_tests/mo/analysis/Iterator_get_next_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/analysis/Iterator_get_next_test.py rename to tools/mo/unit_tests/mo/analysis/Iterator_get_next_test.py diff --git a/tools/mo/unit_tests/extensions/__init__.py b/tools/mo/unit_tests/mo/analysis/__init__.py similarity index 100% rename from tools/mo/unit_tests/extensions/__init__.py rename to tools/mo/unit_tests/mo/analysis/__init__.py diff --git a/tools/mo/unit_tests/extensions/back/ChangeOutputTypeAttributes_test.py b/tools/mo/unit_tests/mo/back/ChangeOutputTypeAttributes_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ChangeOutputTypeAttributes_test.py rename to tools/mo/unit_tests/mo/back/ChangeOutputTypeAttributes_test.py diff --git a/tools/mo/unit_tests/extensions/back/ChangeRandomUniformOutputType_test.py b/tools/mo/unit_tests/mo/back/ChangeRandomUniformOutputType_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ChangeRandomUniformOutputType_test.py rename to tools/mo/unit_tests/mo/back/ChangeRandomUniformOutputType_test.py diff --git a/tools/mo/unit_tests/extensions/back/ClampNormalizer_test.py b/tools/mo/unit_tests/mo/back/ClampNormalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ClampNormalizer_test.py rename to tools/mo/unit_tests/mo/back/ClampNormalizer_test.py diff --git a/tools/mo/unit_tests/extensions/back/ConvolutionNormalizer_test.py b/tools/mo/unit_tests/mo/back/ConvolutionNormalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ConvolutionNormalizer_test.py rename to tools/mo/unit_tests/mo/back/ConvolutionNormalizer_test.py diff --git a/tools/mo/unit_tests/extensions/back/CutMemory_test.py b/tools/mo/unit_tests/mo/back/CutMemory_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/CutMemory_test.py rename to tools/mo/unit_tests/mo/back/CutMemory_test.py diff --git a/tools/mo/unit_tests/extensions/back/FakeOutputResolver_test.py b/tools/mo/unit_tests/mo/back/FakeOutputResolver_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/FakeOutputResolver_test.py rename to tools/mo/unit_tests/mo/back/FakeOutputResolver_test.py diff --git a/tools/mo/unit_tests/extensions/back/FuseTransposesSequence_test.py b/tools/mo/unit_tests/mo/back/FuseTransposesSequence_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/FuseTransposesSequence_test.py rename to tools/mo/unit_tests/mo/back/FuseTransposesSequence_test.py diff --git a/tools/mo/unit_tests/extensions/back/GatherTreeNormalizer_test.py b/tools/mo/unit_tests/mo/back/GatherTreeNormalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/GatherTreeNormalizer_test.py rename to tools/mo/unit_tests/mo/back/GatherTreeNormalizer_test.py diff --git a/tools/mo/unit_tests/extensions/back/InterpolateReshape_test.py b/tools/mo/unit_tests/mo/back/InterpolateReshape_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/InterpolateReshape_test.py rename to tools/mo/unit_tests/mo/back/InterpolateReshape_test.py diff --git a/tools/mo/unit_tests/extensions/back/LayoutChangeForGatherND_test.py b/tools/mo/unit_tests/mo/back/LayoutChangeForGatherND_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/LayoutChangeForGatherND_test.py rename to tools/mo/unit_tests/mo/back/LayoutChangeForGatherND_test.py diff --git a/tools/mo/unit_tests/extensions/back/MarkNodesWithShapeValues_test.py b/tools/mo/unit_tests/mo/back/MarkNodesWithShapeValues_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/MarkNodesWithShapeValues_test.py rename to tools/mo/unit_tests/mo/back/MarkNodesWithShapeValues_test.py diff --git a/tools/mo/unit_tests/extensions/back/MatMulNormalizer_test.py b/tools/mo/unit_tests/mo/back/MatMulNormalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/MatMulNormalizer_test.py rename to tools/mo/unit_tests/mo/back/MatMulNormalizer_test.py diff --git a/tools/mo/unit_tests/extensions/back/OptimizeTransposeReshapeSequence_test.py b/tools/mo/unit_tests/mo/back/OptimizeTransposeReshapeSequence_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/OptimizeTransposeReshapeSequence_test.py rename to tools/mo/unit_tests/mo/back/OptimizeTransposeReshapeSequence_test.py diff --git a/tools/mo/unit_tests/extensions/back/ReduceTransposeDimensions_test.py b/tools/mo/unit_tests/mo/back/ReduceTransposeDimensions_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ReduceTransposeDimensions_test.py rename to tools/mo/unit_tests/mo/back/ReduceTransposeDimensions_test.py diff --git a/tools/mo/unit_tests/extensions/back/ResultRename_test.py b/tools/mo/unit_tests/mo/back/ResultRename_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ResultRename_test.py rename to tools/mo/unit_tests/mo/back/ResultRename_test.py diff --git a/tools/mo/unit_tests/extensions/back/ReverseInputChannels_test.py b/tools/mo/unit_tests/mo/back/ReverseInputChannels_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ReverseInputChannels_test.py rename to tools/mo/unit_tests/mo/back/ReverseInputChannels_test.py diff --git a/tools/mo/unit_tests/extensions/back/ShapeOfConstFolding_test.py b/tools/mo/unit_tests/mo/back/ShapeOfConstFolding_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ShapeOfConstFolding_test.py rename to tools/mo/unit_tests/mo/back/ShapeOfConstFolding_test.py diff --git a/tools/mo/unit_tests/extensions/back/ShuffleChannelPatternOptimization_test.py b/tools/mo/unit_tests/mo/back/ShuffleChannelPatternOptimization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/ShuffleChannelPatternOptimization_test.py rename to tools/mo/unit_tests/mo/back/ShuffleChannelPatternOptimization_test.py diff --git a/tools/mo/unit_tests/extensions/back/SpecialNodesFinalization_test.py b/tools/mo/unit_tests/mo/back/SpecialNodesFinalization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/SpecialNodesFinalization_test.py rename to tools/mo/unit_tests/mo/back/SpecialNodesFinalization_test.py diff --git a/tools/mo/unit_tests/extensions/back/TransposeDFT_test.py b/tools/mo/unit_tests/mo/back/TransposeDFT_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/TransposeDFT_test.py rename to tools/mo/unit_tests/mo/back/TransposeDFT_test.py diff --git a/tools/mo/unit_tests/extensions/back/TransposeReduceFusing_test.py b/tools/mo/unit_tests/mo/back/TransposeReduceFusing_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/TransposeReduceFusing_test.py rename to tools/mo/unit_tests/mo/back/TransposeReduceFusing_test.py diff --git a/tools/mo/unit_tests/extensions/back/add_outputs_recursive_test.py b/tools/mo/unit_tests/mo/back/add_outputs_recursive_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/add_outputs_recursive_test.py rename to tools/mo/unit_tests/mo/back/add_outputs_recursive_test.py diff --git a/tools/mo/unit_tests/extensions/back/compress_quantized_weights_test.py b/tools/mo/unit_tests/mo/back/compress_quantized_weights_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/compress_quantized_weights_test.py rename to tools/mo/unit_tests/mo/back/compress_quantized_weights_test.py diff --git a/tools/mo/unit_tests/extensions/back/insert_compatibility_l2normalization_test.py b/tools/mo/unit_tests/mo/back/insert_compatibility_l2normalization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/insert_compatibility_l2normalization_test.py rename to tools/mo/unit_tests/mo/back/insert_compatibility_l2normalization_test.py diff --git a/tools/mo/unit_tests/extensions/back/kaldi_remove_memory_output_test.py b/tools/mo/unit_tests/mo/back/kaldi_remove_memory_output_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/kaldi_remove_memory_output_test.py rename to tools/mo/unit_tests/mo/back/kaldi_remove_memory_output_test.py diff --git a/tools/mo/unit_tests/extensions/back/names_uniqueness_check_test.py b/tools/mo/unit_tests/mo/back/names_uniqueness_check_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/names_uniqueness_check_test.py rename to tools/mo/unit_tests/mo/back/names_uniqueness_check_test.py diff --git a/tools/mo/unit_tests/extensions/back/remove_last_softmax_test.py b/tools/mo/unit_tests/mo/back/remove_last_softmax_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/back/remove_last_softmax_test.py rename to tools/mo/unit_tests/mo/back/remove_last_softmax_test.py diff --git a/tools/mo/unit_tests/extensions/front/ATenToEmbeddingBag_test.py b/tools/mo/unit_tests/mo/front/ATenToEmbeddingBag_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/ATenToEmbeddingBag_test.py rename to tools/mo/unit_tests/mo/front/ATenToEmbeddingBag_test.py diff --git a/tools/mo/unit_tests/extensions/front/AttributedClampNormalizer_test.py b/tools/mo/unit_tests/mo/front/AttributedClampNormalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/AttributedClampNormalizer_test.py rename to tools/mo/unit_tests/mo/front/AttributedClampNormalizer_test.py diff --git a/tools/mo/unit_tests/extensions/front/AttributedPadToPad_test.py b/tools/mo/unit_tests/mo/front/AttributedPadToPad_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/AttributedPadToPad_test.py rename to tools/mo/unit_tests/mo/front/AttributedPadToPad_test.py diff --git a/tools/mo/unit_tests/extensions/front/AttributedRandomUniformToRandomUniform_test.py b/tools/mo/unit_tests/mo/front/AttributedRandomUniformToRandomUniform_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/AttributedRandomUniformToRandomUniform_test.py rename to tools/mo/unit_tests/mo/front/AttributedRandomUniformToRandomUniform_test.py diff --git a/tools/mo/unit_tests/extensions/front/AttributedRollToRoll_test.py b/tools/mo/unit_tests/mo/front/AttributedRollToRoll_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/AttributedRollToRoll_test.py rename to tools/mo/unit_tests/mo/front/AttributedRollToRoll_test.py diff --git a/tools/mo/unit_tests/extensions/front/GeLUMerger_Erf_test.py b/tools/mo/unit_tests/mo/front/GeLUMerger_Erf_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/GeLUMerger_Erf_test.py rename to tools/mo/unit_tests/mo/front/GeLUMerger_Erf_test.py diff --git a/tools/mo/unit_tests/extensions/front/GeLUMerger_Tanh_test.py b/tools/mo/unit_tests/mo/front/GeLUMerger_Tanh_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/GeLUMerger_Tanh_test.py rename to tools/mo/unit_tests/mo/front/GeLUMerger_Tanh_test.py diff --git a/tools/mo/unit_tests/extensions/front/GlobalPoolingToReduce_test.py b/tools/mo/unit_tests/mo/front/GlobalPoolingToReduce_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/GlobalPoolingToReduce_test.py rename to tools/mo/unit_tests/mo/front/GlobalPoolingToReduce_test.py diff --git a/tools/mo/unit_tests/extensions/front/HSigmoid_fusion_test.py b/tools/mo/unit_tests/mo/front/HSigmoid_fusion_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/HSigmoid_fusion_test.py rename to tools/mo/unit_tests/mo/front/HSigmoid_fusion_test.py diff --git a/tools/mo/unit_tests/extensions/front/HSwish_fusing_test.py b/tools/mo/unit_tests/mo/front/HSwish_fusing_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/HSwish_fusing_test.py rename to tools/mo/unit_tests/mo/front/HSwish_fusing_test.py diff --git a/tools/mo/unit_tests/extensions/front/LayerNorm_test.py b/tools/mo/unit_tests/mo/front/LayerNorm_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/LayerNorm_test.py rename to tools/mo/unit_tests/mo/front/LayerNorm_test.py diff --git a/tools/mo/unit_tests/extensions/front/Log1p_test.py b/tools/mo/unit_tests/mo/front/Log1p_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/Log1p_test.py rename to tools/mo/unit_tests/mo/front/Log1p_test.py diff --git a/tools/mo/unit_tests/extensions/front/OneHotDepthNormalizer_test.py b/tools/mo/unit_tests/mo/front/OneHotDepthNormalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/OneHotDepthNormalizer_test.py rename to tools/mo/unit_tests/mo/front/OneHotDepthNormalizer_test.py diff --git a/tools/mo/unit_tests/extensions/front/Pack_test.py b/tools/mo/unit_tests/mo/front/Pack_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/Pack_test.py rename to tools/mo/unit_tests/mo/front/Pack_test.py diff --git a/tools/mo/unit_tests/extensions/front/RollWithEmptyAxesReplacer_test.py b/tools/mo/unit_tests/mo/front/RollWithEmptyAxesReplacer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/RollWithEmptyAxesReplacer_test.py rename to tools/mo/unit_tests/mo/front/RollWithEmptyAxesReplacer_test.py diff --git a/tools/mo/unit_tests/extensions/front/ThresholdedReluDecomposition_test.py b/tools/mo/unit_tests/mo/front/ThresholdedReluDecomposition_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/ThresholdedReluDecomposition_test.py rename to tools/mo/unit_tests/mo/front/ThresholdedReluDecomposition_test.py diff --git a/tools/mo/unit_tests/extensions/front/binary_quantize_normalization_test.py b/tools/mo/unit_tests/mo/front/binary_quantize_normalization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/binary_quantize_normalization_test.py rename to tools/mo/unit_tests/mo/front/binary_quantize_normalization_test.py diff --git a/tools/mo/unit_tests/extensions/front/broadcast_with_range_test.py b/tools/mo/unit_tests/mo/front/broadcast_with_range_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/broadcast_with_range_test.py rename to tools/mo/unit_tests/mo/front/broadcast_with_range_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/MVNCaffeToMVN_test.py b/tools/mo/unit_tests/mo/front/caffe/MVNCaffeToMVN_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/MVNCaffeToMVN_test.py rename to tools/mo/unit_tests/mo/front/caffe/MVNCaffeToMVN_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/argmax_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/argmax_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/argmax_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/argmax_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/axpy_test.py b/tools/mo/unit_tests/mo/front/caffe/axpy_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/axpy_test.py rename to tools/mo/unit_tests/mo/front/caffe/axpy_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/bn_test.py b/tools/mo/unit_tests/mo/front/caffe/bn_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/bn_test.py rename to tools/mo/unit_tests/mo/front/caffe/bn_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/conv_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/conv_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/conv_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/conv_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/crop_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/crop_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/crop_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/crop_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/ctcgreedydecoder_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/ctcgreedydecoder_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/ctcgreedydecoder_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/ctcgreedydecoder_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/elementwise_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/elementwise_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/elementwise_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/elementwise_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/eltwise_add_normalize_test.py b/tools/mo/unit_tests/mo/front/caffe/eltwise_add_normalize_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/eltwise_add_normalize_test.py rename to tools/mo/unit_tests/mo/front/caffe/eltwise_add_normalize_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/elu_test.py b/tools/mo/unit_tests/mo/front/caffe/elu_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/elu_test.py rename to tools/mo/unit_tests/mo/front/caffe/elu_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/grn_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/grn_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/grn_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/grn_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/normalize_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/normalize_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/normalize_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/normalize_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/pooling_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/pooling_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/pooling_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/pooling_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/prelu_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/prelu_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/prelu_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/prelu_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/priorbox_clustered_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/priorbox_clustered_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/priorbox_clustered_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/priorbox_clustered_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/priorbox_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/priorbox_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/priorbox_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/priorbox_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/proposal_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/proposal_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/proposal_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/proposal_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/proposal_python_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/proposal_python_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/proposal_python_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/proposal_python_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/regionyolo_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/regionyolo_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/regionyolo_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/regionyolo_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/caffe/reorgyolo_ext_test.py b/tools/mo/unit_tests/mo/front/caffe/reorgyolo_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/caffe/reorgyolo_ext_test.py rename to tools/mo/unit_tests/mo/front/caffe/reorgyolo_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/div_test.py b/tools/mo/unit_tests/mo/front/div_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/div_test.py rename to tools/mo/unit_tests/mo/front/div_test.py diff --git a/tools/mo/unit_tests/extensions/front/eltwise_n_test.py b/tools/mo/unit_tests/mo/front/eltwise_n_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/eltwise_n_test.py rename to tools/mo/unit_tests/mo/front/eltwise_n_test.py diff --git a/tools/mo/unit_tests/extensions/front/freeze_placeholder_value_test.py b/tools/mo/unit_tests/mo/front/freeze_placeholder_value_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/freeze_placeholder_value_test.py rename to tools/mo/unit_tests/mo/front/freeze_placeholder_value_test.py diff --git a/tools/mo/unit_tests/extensions/front/image_scaler_test.py b/tools/mo/unit_tests/mo/front/image_scaler_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/image_scaler_test.py rename to tools/mo/unit_tests/mo/front/image_scaler_test.py diff --git a/tools/mo/unit_tests/extensions/front/instance_normalization_test.py b/tools/mo/unit_tests/mo/front/instance_normalization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/instance_normalization_test.py rename to tools/mo/unit_tests/mo/front/instance_normalization_test.py diff --git a/tools/mo/unit_tests/extensions/front/interpolate_reshape_test.py b/tools/mo/unit_tests/mo/front/interpolate_reshape_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/interpolate_reshape_test.py rename to tools/mo/unit_tests/mo/front/interpolate_reshape_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/add_permute_after_convolution_test.py b/tools/mo/unit_tests/mo/front/kaldi/add_permute_after_convolution_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/add_permute_after_convolution_test.py rename to tools/mo/unit_tests/mo/front/kaldi/add_permute_after_convolution_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/apply_counts_test.py b/tools/mo/unit_tests/mo/front/kaldi/apply_counts_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/apply_counts_test.py rename to tools/mo/unit_tests/mo/front/kaldi/apply_counts_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/memory_offset_adjustment_test.py b/tools/mo/unit_tests/mo/front/kaldi/memory_offset_adjustment_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/memory_offset_adjustment_test.py rename to tools/mo/unit_tests/mo/front/kaldi/memory_offset_adjustment_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/replace_lstm_nonlinearity_test.py b/tools/mo/unit_tests/mo/front/kaldi/replace_lstm_nonlinearity_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/replace_lstm_nonlinearity_test.py rename to tools/mo/unit_tests/mo/front/kaldi/replace_lstm_nonlinearity_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/replace_timeheightconvolution_test.py b/tools/mo/unit_tests/mo/front/kaldi/replace_timeheightconvolution_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/replace_timeheightconvolution_test.py rename to tools/mo/unit_tests/mo/front/kaldi/replace_timeheightconvolution_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/set_ports_test.py b/tools/mo/unit_tests/mo/front/kaldi/set_ports_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/set_ports_test.py rename to tools/mo/unit_tests/mo/front/kaldi/set_ports_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/sigmoid_ext_test.py b/tools/mo/unit_tests/mo/front/kaldi/sigmoid_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/sigmoid_ext_test.py rename to tools/mo/unit_tests/mo/front/kaldi/sigmoid_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/tanh_ext_test.py b/tools/mo/unit_tests/mo/front/kaldi/tanh_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/tanh_ext_test.py rename to tools/mo/unit_tests/mo/front/kaldi/tanh_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/kaldi/tdnn_component_replacer_test.py b/tools/mo/unit_tests/mo/front/kaldi/tdnn_component_replacer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/kaldi/tdnn_component_replacer_test.py rename to tools/mo/unit_tests/mo/front/kaldi/tdnn_component_replacer_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/MXFFTToDFT_test.py b/tools/mo/unit_tests/mo/front/mxnet/MXFFTToDFT_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/MXFFTToDFT_test.py rename to tools/mo/unit_tests/mo/front/mxnet/MXFFTToDFT_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/RNN_ext_test.py b/tools/mo/unit_tests/mo/front/mxnet/RNN_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/RNN_ext_test.py rename to tools/mo/unit_tests/mo/front/mxnet/RNN_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/activation_test.py b/tools/mo/unit_tests/mo/front/mxnet/activation_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/activation_test.py rename to tools/mo/unit_tests/mo/front/mxnet/activation_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py b/tools/mo/unit_tests/mo/front/mxnet/add_input_data_to_prior_boxes_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/add_input_data_to_prior_boxes_test.py rename to tools/mo/unit_tests/mo/front/mxnet/add_input_data_to_prior_boxes_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/check_softmax_node_inputs_test.py b/tools/mo/unit_tests/mo/front/mxnet/check_softmax_node_inputs_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/check_softmax_node_inputs_test.py rename to tools/mo/unit_tests/mo/front/mxnet/check_softmax_node_inputs_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/conv_ext_test.py b/tools/mo/unit_tests/mo/front/mxnet/conv_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/conv_ext_test.py rename to tools/mo/unit_tests/mo/front/mxnet/conv_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/custom_test.py b/tools/mo/unit_tests/mo/front/mxnet/custom_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/custom_test.py rename to tools/mo/unit_tests/mo/front/mxnet/custom_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/gather_test.py b/tools/mo/unit_tests/mo/front/mxnet/gather_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/gather_test.py rename to tools/mo/unit_tests/mo/front/mxnet/gather_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/gluoncv_ssd_anchors_test.py b/tools/mo/unit_tests/mo/front/mxnet/gluoncv_ssd_anchors_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/gluoncv_ssd_anchors_test.py rename to tools/mo/unit_tests/mo/front/mxnet/gluoncv_ssd_anchors_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/leaky_relu_test.py b/tools/mo/unit_tests/mo/front/mxnet/leaky_relu_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/leaky_relu_test.py rename to tools/mo/unit_tests/mo/front/mxnet/leaky_relu_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/multibox_detection_test.py b/tools/mo/unit_tests/mo/front/mxnet/multibox_detection_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/multibox_detection_test.py rename to tools/mo/unit_tests/mo/front/mxnet/multibox_detection_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/mx_reshape_reverse_test.py b/tools/mo/unit_tests/mo/front/mxnet/mx_reshape_reverse_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/mx_reshape_reverse_test.py rename to tools/mo/unit_tests/mo/front/mxnet/mx_reshape_reverse_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/mx_reshape_to_reshape_test.py b/tools/mo/unit_tests/mo/front/mxnet/mx_reshape_to_reshape_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/mx_reshape_to_reshape_test.py rename to tools/mo/unit_tests/mo/front/mxnet/mx_reshape_to_reshape_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/pooling_ext_test.py b/tools/mo/unit_tests/mo/front/mxnet/pooling_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/pooling_ext_test.py rename to tools/mo/unit_tests/mo/front/mxnet/pooling_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/sigmoid_test.py b/tools/mo/unit_tests/mo/front/mxnet/sigmoid_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/sigmoid_test.py rename to tools/mo/unit_tests/mo/front/mxnet/sigmoid_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py b/tools/mo/unit_tests/mo/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py rename to tools/mo/unit_tests/mo/front/mxnet/ssd_pattern_flatten_softmax_activation_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py b/tools/mo/unit_tests/mo/front/mxnet/ssd_pattern_remove_flatten_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/ssd_pattern_remove_flatten_test.py rename to tools/mo/unit_tests/mo/front/mxnet/ssd_pattern_remove_flatten_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py b/tools/mo/unit_tests/mo/front/mxnet/ssd_pattern_remove_reshape_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/ssd_pattern_remove_reshape_test.py rename to tools/mo/unit_tests/mo/front/mxnet/ssd_pattern_remove_reshape_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py b/tools/mo/unit_tests/mo/front/mxnet/ssd_pattern_remove_transpose_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/ssd_pattern_remove_transpose_test.py rename to tools/mo/unit_tests/mo/front/mxnet/ssd_pattern_remove_transpose_test.py diff --git a/tools/mo/unit_tests/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py b/tools/mo/unit_tests/mo/front/mxnet/ssd_reorder_detection_out_inputs_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/mxnet/ssd_reorder_detection_out_inputs_test.py rename to tools/mo/unit_tests/mo/front/mxnet/ssd_reorder_detection_out_inputs_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/AttributedSliceToSlice_test.py b/tools/mo/unit_tests/mo/front/onnx/AttributedSliceToSlice_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/AttributedSliceToSlice_test.py rename to tools/mo/unit_tests/mo/front/onnx/AttributedSliceToSlice_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/MvnOnnxToMvn_test.py b/tools/mo/unit_tests/mo/front/onnx/MvnOnnxToMvn_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/MvnOnnxToMvn_test.py rename to tools/mo/unit_tests/mo/front/onnx/MvnOnnxToMvn_test.py diff --git a/tools/mo/unit_tests/extensions/analysis/__init__.py b/tools/mo/unit_tests/mo/front/onnx/__init__.py similarity index 100% rename from tools/mo/unit_tests/extensions/analysis/__init__.py rename to tools/mo/unit_tests/mo/front/onnx/__init__.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/activation_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/activation_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/activation_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/activation_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/affine_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/affine_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/affine_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/affine_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/conv_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/conv_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/conv_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/conv_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/crop_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/crop_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/crop_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/crop_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/detection_output_test.py b/tools/mo/unit_tests/mo/front/onnx/detection_output_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/detection_output_test.py rename to tools/mo/unit_tests/mo/front/onnx/detection_output_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/gru_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/gru_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/gru_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/gru_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/image_scaler_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/image_scaler_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/image_scaler_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/image_scaler_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/instance_normalization_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/instance_normalization_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/instance_normalization_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/instance_normalization_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/lstm_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/lstm_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/lstm_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/lstm_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/normalize_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/normalize_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/normalize_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/normalize_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/pad_converter_test.py b/tools/mo/unit_tests/mo/front/onnx/pad_converter_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/pad_converter_test.py rename to tools/mo/unit_tests/mo/front/onnx/pad_converter_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/pad_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/pad_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/pad_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/pad_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/priorbox_clustered_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/priorbox_clustered_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/priorbox_clustered_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/priorbox_clustered_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/priorbox_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/priorbox_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/priorbox_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/priorbox_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/rnn_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/rnn_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/rnn_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/rnn_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/squeeze_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/squeeze_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/squeeze_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/squeeze_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/transpose_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/transpose_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/transpose_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/transpose_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/unsqueeze_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/unsqueeze_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/unsqueeze_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/unsqueeze_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/onnx/upsample_ext_test.py b/tools/mo/unit_tests/mo/front/onnx/upsample_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/onnx/upsample_ext_test.py rename to tools/mo/unit_tests/mo/front/onnx/upsample_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/output_cut_test.py b/tools/mo/unit_tests/mo/front/output_cut_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/output_cut_test.py rename to tools/mo/unit_tests/mo/front/output_cut_test.py diff --git a/tools/mo/unit_tests/extensions/front/rank_decomposer_test.py b/tools/mo/unit_tests/mo/front/rank_decomposer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/rank_decomposer_test.py rename to tools/mo/unit_tests/mo/front/rank_decomposer_test.py diff --git a/tools/mo/unit_tests/extensions/front/reciprocal_test.py b/tools/mo/unit_tests/mo/front/reciprocal_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/reciprocal_test.py rename to tools/mo/unit_tests/mo/front/reciprocal_test.py diff --git a/tools/mo/unit_tests/extensions/front/reduce_axis_normalizer_test.py b/tools/mo/unit_tests/mo/front/reduce_axis_normalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/reduce_axis_normalizer_test.py rename to tools/mo/unit_tests/mo/front/reduce_axis_normalizer_test.py diff --git a/tools/mo/unit_tests/extensions/front/scatter_normalizer_test.py b/tools/mo/unit_tests/mo/front/scatter_normalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/scatter_normalizer_test.py rename to tools/mo/unit_tests/mo/front/scatter_normalizer_test.py diff --git a/tools/mo/unit_tests/extensions/front/size_replacer_test.py b/tools/mo/unit_tests/mo/front/size_replacer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/size_replacer_test.py rename to tools/mo/unit_tests/mo/front/size_replacer_test.py diff --git a/tools/mo/unit_tests/extensions/front/softsign_replacer_test.py b/tools/mo/unit_tests/mo/front/softsign_replacer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/softsign_replacer_test.py rename to tools/mo/unit_tests/mo/front/softsign_replacer_test.py diff --git a/tools/mo/unit_tests/extensions/front/split_normalizer_test.py b/tools/mo/unit_tests/mo/front/split_normalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/split_normalizer_test.py rename to tools/mo/unit_tests/mo/front/split_normalizer_test.py diff --git a/tools/mo/unit_tests/extensions/front/sub_test.py b/tools/mo/unit_tests/mo/front/sub_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/sub_test.py rename to tools/mo/unit_tests/mo/front/sub_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/CTCGreedyDecoderReplacement_test.py b/tools/mo/unit_tests/mo/front/tf/CTCGreedyDecoderReplacement_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/CTCGreedyDecoderReplacement_test.py rename to tools/mo/unit_tests/mo/front/tf/CTCGreedyDecoderReplacement_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/CTCLossReplacement_test.py b/tools/mo/unit_tests/mo/front/tf/CTCLossReplacement_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/CTCLossReplacement_test.py rename to tools/mo/unit_tests/mo/front/tf/CTCLossReplacement_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/ComplexAbsAfterComplex_test.py b/tools/mo/unit_tests/mo/front/tf/ComplexAbsAfterComplex_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/ComplexAbsAfterComplex_test.py rename to tools/mo/unit_tests/mo/front/tf/ComplexAbsAfterComplex_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/ComplexAbs_test.py b/tools/mo/unit_tests/mo/front/tf/ComplexAbs_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/ComplexAbs_test.py rename to tools/mo/unit_tests/mo/front/tf/ComplexAbs_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/CorrectRollAxes_test.py b/tools/mo/unit_tests/mo/front/tf/CorrectRollAxes_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/CorrectRollAxes_test.py rename to tools/mo/unit_tests/mo/front/tf/CorrectRollAxes_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/IteratorGetNextCut_test.py b/tools/mo/unit_tests/mo/front/tf/IteratorGetNextCut_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/IteratorGetNextCut_test.py rename to tools/mo/unit_tests/mo/front/tf/IteratorGetNextCut_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py b/tools/mo/unit_tests/mo/front/tf/NonConstBeginStridedSliceReplacement_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/NonConstBeginStridedSliceReplacement_test.py rename to tools/mo/unit_tests/mo/front/tf/NonConstBeginStridedSliceReplacement_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/ObjectDetectionAPI_test.py b/tools/mo/unit_tests/mo/front/tf/ObjectDetectionAPI_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/ObjectDetectionAPI_test.py rename to tools/mo/unit_tests/mo/front/tf/ObjectDetectionAPI_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/RollRealImagPack_test.py b/tools/mo/unit_tests/mo/front/tf/RollRealImagPack_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/RollRealImagPack_test.py rename to tools/mo/unit_tests/mo/front/tf/RollRealImagPack_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/SSliceComplex_test.py b/tools/mo/unit_tests/mo/front/tf/SSliceComplex_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/SSliceComplex_test.py rename to tools/mo/unit_tests/mo/front/tf/SSliceComplex_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/SwitchMergeOptimization_test.py b/tools/mo/unit_tests/mo/front/tf/SwitchMergeOptimization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/SwitchMergeOptimization_test.py rename to tools/mo/unit_tests/mo/front/tf/SwitchMergeOptimization_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/TFFFTToDFT_test.py b/tools/mo/unit_tests/mo/front/tf/TFFFTToDFT_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/TFFFTToDFT_test.py rename to tools/mo/unit_tests/mo/front/tf/TFFFTToDFT_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/TFSliceToSlice_test.py b/tools/mo/unit_tests/mo/front/tf/TFSliceToSlice_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/TFSliceToSlice_test.py rename to tools/mo/unit_tests/mo/front/tf/TFSliceToSlice_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/WhereDecomposition_test.py b/tools/mo/unit_tests/mo/front/tf/WhereDecomposition_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/WhereDecomposition_test.py rename to tools/mo/unit_tests/mo/front/tf/WhereDecomposition_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/concat_ext_test.py b/tools/mo/unit_tests/mo/front/tf/concat_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/concat_ext_test.py rename to tools/mo/unit_tests/mo/front/tf/concat_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/concat_test.py b/tools/mo/unit_tests/mo/front/tf/concat_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/concat_test.py rename to tools/mo/unit_tests/mo/front/tf/concat_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/conv_ext_test.py b/tools/mo/unit_tests/mo/front/tf/conv_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/conv_ext_test.py rename to tools/mo/unit_tests/mo/front/tf/conv_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/deconv_ext_test.py b/tools/mo/unit_tests/mo/front/tf/deconv_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/deconv_ext_test.py rename to tools/mo/unit_tests/mo/front/tf/deconv_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/embedding_segments_operation_fusing_test.py b/tools/mo/unit_tests/mo/front/tf/embedding_segments_operation_fusing_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/embedding_segments_operation_fusing_test.py rename to tools/mo/unit_tests/mo/front/tf/embedding_segments_operation_fusing_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/embedding_segments_sum_test.py b/tools/mo/unit_tests/mo/front/tf/embedding_segments_sum_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/embedding_segments_sum_test.py rename to tools/mo/unit_tests/mo/front/tf/embedding_segments_sum_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/fifo_replacer_test.py b/tools/mo/unit_tests/mo/front/tf/fifo_replacer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/fifo_replacer_test.py rename to tools/mo/unit_tests/mo/front/tf/fifo_replacer_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/floor_div_test.py b/tools/mo/unit_tests/mo/front/tf/floor_div_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/floor_div_test.py rename to tools/mo/unit_tests/mo/front/tf/floor_div_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/identityN_to_identity_test.py b/tools/mo/unit_tests/mo/front/tf/identityN_to_identity_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/identityN_to_identity_test.py rename to tools/mo/unit_tests/mo/front/tf/identityN_to_identity_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/mvn_unrolled_test.py b/tools/mo/unit_tests/mo/front/tf/mvn_unrolled_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/mvn_unrolled_test.py rename to tools/mo/unit_tests/mo/front/tf/mvn_unrolled_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/next_iteration_ext_test.py b/tools/mo/unit_tests/mo/front/tf/next_iteration_ext_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/next_iteration_ext_test.py rename to tools/mo/unit_tests/mo/front/tf/next_iteration_ext_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/pad_tf_to_pad_test.py b/tools/mo/unit_tests/mo/front/tf/pad_tf_to_pad_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/pad_tf_to_pad_test.py rename to tools/mo/unit_tests/mo/front/tf/pad_tf_to_pad_test.py diff --git a/tools/mo/unit_tests/extensions/front/tf/sparse_to_dense_replacer_test.py b/tools/mo/unit_tests/mo/front/tf/sparse_to_dense_replacer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/front/tf/sparse_to_dense_replacer_test.py rename to tools/mo/unit_tests/mo/front/tf/sparse_to_dense_replacer_test.py diff --git a/tools/mo/unit_tests/extensions/load/tf/loader_test.py b/tools/mo/unit_tests/mo/load/loader_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/load/tf/loader_test.py rename to tools/mo/unit_tests/mo/load/loader_test.py diff --git a/tools/mo/unit_tests/mo/main_test_actual.py b/tools/mo/unit_tests/mo/main_test_actual.py index 76b9c6c9f05..3756dcf46d4 100644 --- a/tools/mo/unit_tests/mo/main_test_actual.py +++ b/tools/mo/unit_tests/mo/main_test_actual.py @@ -22,7 +22,7 @@ ngraph_needed = pytest.mark.skipif(not ngraph_available, class TestMainErrors(unittest.TestCase): @patch('argparse.ArgumentParser.parse_args', return_value=argparse.Namespace()) - @patch('mo.main.driver', side_effect=FrameworkError('FW ERROR MESSAGE')) + @patch('openvino.tools.mo.main.driver', side_effect=FrameworkError('FW ERROR MESSAGE')) @ngraph_needed def test_FrameworkError(self, mock_argparse, mock_driver): with self.assertLogs() as logger: diff --git a/tools/mo/unit_tests/extensions/middle/AddIsCyclicAttribute_test.py b/tools/mo/unit_tests/mo/middle/AddIsCyclicAttribute_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/AddIsCyclicAttribute_test.py rename to tools/mo/unit_tests/mo/middle/AddIsCyclicAttribute_test.py diff --git a/tools/mo/unit_tests/extensions/middle/AddMeanScaleValues_test.py b/tools/mo/unit_tests/mo/middle/AddMeanScaleValues_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/AddMeanScaleValues_test.py rename to tools/mo/unit_tests/mo/middle/AddMeanScaleValues_test.py diff --git a/tools/mo/unit_tests/extensions/middle/ArgOpsToTopK_test.py b/tools/mo/unit_tests/mo/middle/ArgOpsToTopK_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/ArgOpsToTopK_test.py rename to tools/mo/unit_tests/mo/middle/ArgOpsToTopK_test.py diff --git a/tools/mo/unit_tests/extensions/middle/CheckForCycle_test.py b/tools/mo/unit_tests/mo/middle/CheckForCycle_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/CheckForCycle_test.py rename to tools/mo/unit_tests/mo/middle/CheckForCycle_test.py diff --git a/tools/mo/unit_tests/extensions/middle/ConcatOptimization_test.py b/tools/mo/unit_tests/mo/middle/ConcatOptimization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/ConcatOptimization_test.py rename to tools/mo/unit_tests/mo/middle/ConcatOptimization_test.py diff --git a/tools/mo/unit_tests/extensions/middle/ConvertGroupedStridedSlice_test.py b/tools/mo/unit_tests/mo/middle/ConvertGroupedStridedSlice_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/ConvertGroupedStridedSlice_test.py rename to tools/mo/unit_tests/mo/middle/ConvertGroupedStridedSlice_test.py diff --git a/tools/mo/unit_tests/extensions/middle/CutInputHavingZeroDimFromConcat_test.py b/tools/mo/unit_tests/mo/middle/CutInputHavingZeroDimFromConcat_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/CutInputHavingZeroDimFromConcat_test.py rename to tools/mo/unit_tests/mo/middle/CutInputHavingZeroDimFromConcat_test.py diff --git a/tools/mo/unit_tests/extensions/middle/EltwiseInputReshape_test.py b/tools/mo/unit_tests/mo/middle/EltwiseInputReshape_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/EltwiseInputReshape_test.py rename to tools/mo/unit_tests/mo/middle/EltwiseInputReshape_test.py diff --git a/tools/mo/unit_tests/extensions/middle/FakeSplitOutputs_test.py b/tools/mo/unit_tests/mo/middle/FakeSplitOutputs_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/FakeSplitOutputs_test.py rename to tools/mo/unit_tests/mo/middle/FakeSplitOutputs_test.py diff --git a/tools/mo/unit_tests/extensions/middle/FusedBatchNormTraining_test.py b/tools/mo/unit_tests/mo/middle/FusedBatchNormTraining_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/FusedBatchNormTraining_test.py rename to tools/mo/unit_tests/mo/middle/FusedBatchNormTraining_test.py diff --git a/tools/mo/unit_tests/extensions/middle/GroupNorm_test.py b/tools/mo/unit_tests/mo/middle/GroupNorm_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/GroupNorm_test.py rename to tools/mo/unit_tests/mo/middle/GroupNorm_test.py diff --git a/tools/mo/unit_tests/extensions/middle/InsertSelect_test.py b/tools/mo/unit_tests/mo/middle/InsertSelect_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/InsertSelect_test.py rename to tools/mo/unit_tests/mo/middle/InsertSelect_test.py diff --git a/tools/mo/unit_tests/extensions/middle/InterpolateSequenceToInterpolate_test.py b/tools/mo/unit_tests/mo/middle/InterpolateSequenceToInterpolate_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/InterpolateSequenceToInterpolate_test.py rename to tools/mo/unit_tests/mo/middle/InterpolateSequenceToInterpolate_test.py diff --git a/tools/mo/unit_tests/extensions/middle/L2NormFusing_test.py b/tools/mo/unit_tests/mo/middle/L2NormFusing_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/L2NormFusing_test.py rename to tools/mo/unit_tests/mo/middle/L2NormFusing_test.py diff --git a/tools/mo/unit_tests/extensions/middle/LayoutChangeForEinsum_test.py b/tools/mo/unit_tests/mo/middle/LayoutChangeForEinsum_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/LayoutChangeForEinsum_test.py rename to tools/mo/unit_tests/mo/middle/LayoutChangeForEinsum_test.py diff --git a/tools/mo/unit_tests/extensions/middle/LeakyReluPattern_test.py b/tools/mo/unit_tests/mo/middle/LeakyReluPattern_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/LeakyReluPattern_test.py rename to tools/mo/unit_tests/mo/middle/LeakyReluPattern_test.py diff --git a/tools/mo/unit_tests/extensions/middle/MXTileReplacer_test.py b/tools/mo/unit_tests/mo/middle/MXTileReplacer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/MXTileReplacer_test.py rename to tools/mo/unit_tests/mo/middle/MXTileReplacer_test.py diff --git a/tools/mo/unit_tests/extensions/middle/MakeKaldiConstReshapable_test.py b/tools/mo/unit_tests/mo/middle/MakeKaldiConstReshapable_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/MakeKaldiConstReshapable_test.py rename to tools/mo/unit_tests/mo/middle/MakeKaldiConstReshapable_test.py diff --git a/tools/mo/unit_tests/extensions/middle/MulQuantizeFuse_test.py b/tools/mo/unit_tests/mo/middle/MulQuantizeFuse_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/MulQuantizeFuse_test.py rename to tools/mo/unit_tests/mo/middle/MulQuantizeFuse_test.py diff --git a/tools/mo/unit_tests/extensions/middle/PoolV2ToAttributedPool_test.py b/tools/mo/unit_tests/mo/middle/PoolV2ToAttributedPool_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/PoolV2ToAttributedPool_test.py rename to tools/mo/unit_tests/mo/middle/PoolV2ToAttributedPool_test.py diff --git a/tools/mo/unit_tests/extensions/middle/PreserveRuntimeInfo_test.py b/tools/mo/unit_tests/mo/middle/PreserveRuntimeInfo_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/PreserveRuntimeInfo_test.py rename to tools/mo/unit_tests/mo/middle/PreserveRuntimeInfo_test.py diff --git a/tools/mo/unit_tests/extensions/middle/ReluQuantizeFuse_test.py b/tools/mo/unit_tests/mo/middle/ReluQuantizeFuse_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/ReluQuantizeFuse_test.py rename to tools/mo/unit_tests/mo/middle/ReluQuantizeFuse_test.py diff --git a/tools/mo/unit_tests/extensions/middle/RemoveDuplicationMemory_test.py b/tools/mo/unit_tests/mo/middle/RemoveDuplicationMemory_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/RemoveDuplicationMemory_test.py rename to tools/mo/unit_tests/mo/middle/RemoveDuplicationMemory_test.py diff --git a/tools/mo/unit_tests/extensions/middle/RemoveUselessConcatSplit_test.py b/tools/mo/unit_tests/mo/middle/RemoveUselessConcatSplit_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/RemoveUselessConcatSplit_test.py rename to tools/mo/unit_tests/mo/middle/RemoveUselessConcatSplit_test.py diff --git a/tools/mo/unit_tests/extensions/middle/RemoveUselessCrops_test.py b/tools/mo/unit_tests/mo/middle/RemoveUselessCrops_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/RemoveUselessCrops_test.py rename to tools/mo/unit_tests/mo/middle/RemoveUselessCrops_test.py diff --git a/tools/mo/unit_tests/extensions/middle/RemoveUselessPad_test.py b/tools/mo/unit_tests/mo/middle/RemoveUselessPad_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/RemoveUselessPad_test.py rename to tools/mo/unit_tests/mo/middle/RemoveUselessPad_test.py diff --git a/tools/mo/unit_tests/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py b/tools/mo/unit_tests/mo/middle/ReplaceMemoryOffsetWithSplice_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/ReplaceMemoryOffsetWithSplice_test.py rename to tools/mo/unit_tests/mo/middle/ReplaceMemoryOffsetWithSplice_test.py diff --git a/tools/mo/unit_tests/extensions/middle/ReplacePNormNodePattern_test.py b/tools/mo/unit_tests/mo/middle/ReplacePNormNodePattern_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/ReplacePNormNodePattern_test.py rename to tools/mo/unit_tests/mo/middle/ReplacePNormNodePattern_test.py diff --git a/tools/mo/unit_tests/extensions/middle/ReplaceSpliceNodePattern_test.py b/tools/mo/unit_tests/mo/middle/ReplaceSpliceNodePattern_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/ReplaceSpliceNodePattern_test.py rename to tools/mo/unit_tests/mo/middle/ReplaceSpliceNodePattern_test.py diff --git a/tools/mo/unit_tests/extensions/middle/ReverseTransposeNormalization_test.py b/tools/mo/unit_tests/mo/middle/ReverseTransposeNormalization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/ReverseTransposeNormalization_test.py rename to tools/mo/unit_tests/mo/middle/ReverseTransposeNormalization_test.py diff --git a/tools/mo/unit_tests/extensions/middle/SharedWeightsDuplication_test.py b/tools/mo/unit_tests/mo/middle/SharedWeightsDuplication_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/SharedWeightsDuplication_test.py rename to tools/mo/unit_tests/mo/middle/SharedWeightsDuplication_test.py diff --git a/tools/mo/unit_tests/extensions/middle/SliceConverter_test.py b/tools/mo/unit_tests/mo/middle/SliceConverter_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/SliceConverter_test.py rename to tools/mo/unit_tests/mo/middle/SliceConverter_test.py diff --git a/tools/mo/unit_tests/extensions/middle/SliceLikeToStridedSlice_test.py b/tools/mo/unit_tests/mo/middle/SliceLikeToStridedSlice_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/SliceLikeToStridedSlice_test.py rename to tools/mo/unit_tests/mo/middle/SliceLikeToStridedSlice_test.py diff --git a/tools/mo/unit_tests/extensions/middle/SplitConcatPairToInterpolate_test.py b/tools/mo/unit_tests/mo/middle/SplitConcatPairToInterpolate_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/SplitConcatPairToInterpolate_test.py rename to tools/mo/unit_tests/mo/middle/SplitConcatPairToInterpolate_test.py diff --git a/tools/mo/unit_tests/extensions/middle/StridedSliceNormalizer_test.py b/tools/mo/unit_tests/mo/middle/StridedSliceNormalizer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/StridedSliceNormalizer_test.py rename to tools/mo/unit_tests/mo/middle/StridedSliceNormalizer_test.py diff --git a/tools/mo/unit_tests/extensions/middle/StridedSliceReplacer_test.py b/tools/mo/unit_tests/mo/middle/StridedSliceReplacer_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/StridedSliceReplacer_test.py rename to tools/mo/unit_tests/mo/middle/StridedSliceReplacer_test.py diff --git a/tools/mo/unit_tests/extensions/middle/TensorIteratorBackEdge_test.py b/tools/mo/unit_tests/mo/middle/TensorIteratorBackEdge_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/TensorIteratorBackEdge_test.py rename to tools/mo/unit_tests/mo/middle/TensorIteratorBackEdge_test.py diff --git a/tools/mo/unit_tests/extensions/middle/TensorIteratorCondition_test.py b/tools/mo/unit_tests/mo/middle/TensorIteratorCondition_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/TensorIteratorCondition_test.py rename to tools/mo/unit_tests/mo/middle/TensorIteratorCondition_test.py diff --git a/tools/mo/unit_tests/extensions/middle/TensorIteratorInput_test.py b/tools/mo/unit_tests/mo/middle/TensorIteratorInput_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/TensorIteratorInput_test.py rename to tools/mo/unit_tests/mo/middle/TensorIteratorInput_test.py diff --git a/tools/mo/unit_tests/extensions/middle/TensorIteratorOutput_test.py b/tools/mo/unit_tests/mo/middle/TensorIteratorOutput_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/TensorIteratorOutput_test.py rename to tools/mo/unit_tests/mo/middle/TensorIteratorOutput_test.py diff --git a/tools/mo/unit_tests/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py b/tools/mo/unit_tests/mo/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py rename to tools/mo/unit_tests/mo/middle/UnsqueezeTileReshapeBlockToInterpolate_test.py diff --git a/tools/mo/unit_tests/extensions/middle/UpsampleToResample_test.py b/tools/mo/unit_tests/mo/middle/UpsampleToResample_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/UpsampleToResample_test.py rename to tools/mo/unit_tests/mo/middle/UpsampleToResample_test.py diff --git a/tools/mo/unit_tests/extensions/middle/dequantize_linear_resolver_test.py b/tools/mo/unit_tests/mo/middle/dequantize_linear_resolver_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/dequantize_linear_resolver_test.py rename to tools/mo/unit_tests/mo/middle/dequantize_linear_resolver_test.py diff --git a/tools/mo/unit_tests/extensions/middle/quantize_fuses_test.py b/tools/mo/unit_tests/mo/middle/quantize_fuses_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/quantize_fuses_test.py rename to tools/mo/unit_tests/mo/middle/quantize_fuses_test.py diff --git a/tools/mo/unit_tests/extensions/middle/quantize_linear_resolver_test.py b/tools/mo/unit_tests/mo/middle/quantize_linear_resolver_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/quantize_linear_resolver_test.py rename to tools/mo/unit_tests/mo/middle/quantize_linear_resolver_test.py diff --git a/tools/mo/unit_tests/extensions/middle/reverse_tensor_iterator_test.py b/tools/mo/unit_tests/mo/middle/reverse_tensor_iterator_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/reverse_tensor_iterator_test.py rename to tools/mo/unit_tests/mo/middle/reverse_tensor_iterator_test.py diff --git a/tools/mo/unit_tests/extensions/middle/sparse_reshape_test.py b/tools/mo/unit_tests/mo/middle/sparse_reshape_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/middle/sparse_reshape_test.py rename to tools/mo/unit_tests/mo/middle/sparse_reshape_test.py diff --git a/tools/mo/unit_tests/extensions/ops/ExtractImagePatches_test.py b/tools/mo/unit_tests/mo/ops/ExtractImagePatches_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/ExtractImagePatches_test.py rename to tools/mo/unit_tests/mo/ops/ExtractImagePatches_test.py diff --git a/tools/mo/unit_tests/extensions/ops/If_test.py b/tools/mo/unit_tests/mo/ops/If_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/If_test.py rename to tools/mo/unit_tests/mo/ops/If_test.py diff --git a/tools/mo/unit_tests/extensions/ops/LookupTableInsert_test.py b/tools/mo/unit_tests/mo/ops/LookupTableInsert_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/LookupTableInsert_test.py rename to tools/mo/unit_tests/mo/ops/LookupTableInsert_test.py diff --git a/tools/mo/unit_tests/extensions/ops/MatMul_test.py b/tools/mo/unit_tests/mo/ops/MatMul_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/MatMul_test.py rename to tools/mo/unit_tests/mo/ops/MatMul_test.py diff --git a/tools/mo/unit_tests/extensions/ops/MatMul_value_propagation_test.py b/tools/mo/unit_tests/mo/ops/MatMul_value_propagation_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/MatMul_value_propagation_test.py rename to tools/mo/unit_tests/mo/ops/MatMul_value_propagation_test.py diff --git a/tools/mo/unit_tests/extensions/ops/ONNXResize11_test.py b/tools/mo/unit_tests/mo/ops/ONNXResize11_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/ONNXResize11_test.py rename to tools/mo/unit_tests/mo/ops/ONNXResize11_test.py diff --git a/tools/mo/unit_tests/extensions/ops/ReduceOps_test.py b/tools/mo/unit_tests/mo/ops/ReduceOps_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/ReduceOps_test.py rename to tools/mo/unit_tests/mo/ops/ReduceOps_test.py diff --git a/tools/mo/unit_tests/extensions/ops/Reverse_test.py b/tools/mo/unit_tests/mo/ops/Reverse_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/Reverse_test.py rename to tools/mo/unit_tests/mo/ops/Reverse_test.py diff --git a/tools/mo/unit_tests/extensions/ops/activation_test.py b/tools/mo/unit_tests/mo/ops/activation_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/activation_test.py rename to tools/mo/unit_tests/mo/ops/activation_test.py diff --git a/tools/mo/unit_tests/extensions/ops/argmax_test.py b/tools/mo/unit_tests/mo/ops/argmax_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/argmax_test.py rename to tools/mo/unit_tests/mo/ops/argmax_test.py diff --git a/tools/mo/unit_tests/extensions/ops/assert_test.py b/tools/mo/unit_tests/mo/ops/assert_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/assert_test.py rename to tools/mo/unit_tests/mo/ops/assert_test.py diff --git a/tools/mo/unit_tests/extensions/ops/bucketize_test.py b/tools/mo/unit_tests/mo/ops/bucketize_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/bucketize_test.py rename to tools/mo/unit_tests/mo/ops/bucketize_test.py diff --git a/tools/mo/unit_tests/extensions/ops/cast_test.py b/tools/mo/unit_tests/mo/ops/cast_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/cast_test.py rename to tools/mo/unit_tests/mo/ops/cast_test.py diff --git a/tools/mo/unit_tests/extensions/ops/ctc_greedy_decoder_test.py b/tools/mo/unit_tests/mo/ops/ctc_greedy_decoder_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/ctc_greedy_decoder_test.py rename to tools/mo/unit_tests/mo/ops/ctc_greedy_decoder_test.py diff --git a/tools/mo/unit_tests/extensions/ops/ctc_loss_test.py b/tools/mo/unit_tests/mo/ops/ctc_loss_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/ctc_loss_test.py rename to tools/mo/unit_tests/mo/ops/ctc_loss_test.py diff --git a/tools/mo/unit_tests/extensions/ops/cumsum_test.py b/tools/mo/unit_tests/mo/ops/cumsum_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/cumsum_test.py rename to tools/mo/unit_tests/mo/ops/cumsum_test.py diff --git a/tools/mo/unit_tests/extensions/ops/depth_to_space_test.py b/tools/mo/unit_tests/mo/ops/depth_to_space_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/depth_to_space_test.py rename to tools/mo/unit_tests/mo/ops/depth_to_space_test.py diff --git a/tools/mo/unit_tests/extensions/ops/dft_signal_size_canonicalization_test.py b/tools/mo/unit_tests/mo/ops/dft_signal_size_canonicalization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/dft_signal_size_canonicalization_test.py rename to tools/mo/unit_tests/mo/ops/dft_signal_size_canonicalization_test.py diff --git a/tools/mo/unit_tests/extensions/ops/div_value_propagation_test.py b/tools/mo/unit_tests/mo/ops/div_value_propagation_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/div_value_propagation_test.py rename to tools/mo/unit_tests/mo/ops/div_value_propagation_test.py diff --git a/tools/mo/unit_tests/extensions/ops/einsum_test.py b/tools/mo/unit_tests/mo/ops/einsum_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/einsum_test.py rename to tools/mo/unit_tests/mo/ops/einsum_test.py diff --git a/tools/mo/unit_tests/extensions/ops/elementwise_test.py b/tools/mo/unit_tests/mo/ops/elementwise_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/elementwise_test.py rename to tools/mo/unit_tests/mo/ops/elementwise_test.py diff --git a/tools/mo/unit_tests/extensions/ops/embedding_bag_test.py b/tools/mo/unit_tests/mo/ops/embedding_bag_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/embedding_bag_test.py rename to tools/mo/unit_tests/mo/ops/embedding_bag_test.py diff --git a/tools/mo/unit_tests/extensions/ops/gather_test.py b/tools/mo/unit_tests/mo/ops/gather_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/gather_test.py rename to tools/mo/unit_tests/mo/ops/gather_test.py diff --git a/tools/mo/unit_tests/extensions/ops/gatherelements_test.py b/tools/mo/unit_tests/mo/ops/gatherelements_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/gatherelements_test.py rename to tools/mo/unit_tests/mo/ops/gatherelements_test.py diff --git a/tools/mo/unit_tests/extensions/ops/gathernd_test.py b/tools/mo/unit_tests/mo/ops/gathernd_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/gathernd_test.py rename to tools/mo/unit_tests/mo/ops/gathernd_test.py diff --git a/tools/mo/unit_tests/extensions/ops/grn_test.py b/tools/mo/unit_tests/mo/ops/grn_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/grn_test.py rename to tools/mo/unit_tests/mo/ops/grn_test.py diff --git a/tools/mo/unit_tests/extensions/ops/instance_normalization_test.py b/tools/mo/unit_tests/mo/ops/instance_normalization_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/instance_normalization_test.py rename to tools/mo/unit_tests/mo/ops/instance_normalization_test.py diff --git a/tools/mo/unit_tests/extensions/ops/interpolate_test.py b/tools/mo/unit_tests/mo/ops/interpolate_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/interpolate_test.py rename to tools/mo/unit_tests/mo/ops/interpolate_test.py diff --git a/tools/mo/unit_tests/extensions/ops/merge_test.py b/tools/mo/unit_tests/mo/ops/merge_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/merge_test.py rename to tools/mo/unit_tests/mo/ops/merge_test.py diff --git a/tools/mo/unit_tests/extensions/ops/non_max_suppression_test.py b/tools/mo/unit_tests/mo/ops/non_max_suppression_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/non_max_suppression_test.py rename to tools/mo/unit_tests/mo/ops/non_max_suppression_test.py diff --git a/tools/mo/unit_tests/extensions/ops/normalize_test.py b/tools/mo/unit_tests/mo/ops/normalize_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/normalize_test.py rename to tools/mo/unit_tests/mo/ops/normalize_test.py diff --git a/tools/mo/unit_tests/extensions/ops/one_hot_test.py b/tools/mo/unit_tests/mo/ops/one_hot_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/one_hot_test.py rename to tools/mo/unit_tests/mo/ops/one_hot_test.py diff --git a/tools/mo/unit_tests/extensions/ops/priorbox_clustered_test.py b/tools/mo/unit_tests/mo/ops/priorbox_clustered_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/priorbox_clustered_test.py rename to tools/mo/unit_tests/mo/ops/priorbox_clustered_test.py diff --git a/tools/mo/unit_tests/extensions/ops/priorbox_test.py b/tools/mo/unit_tests/mo/ops/priorbox_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/priorbox_test.py rename to tools/mo/unit_tests/mo/ops/priorbox_test.py diff --git a/tools/mo/unit_tests/extensions/ops/proposal_test.py b/tools/mo/unit_tests/mo/ops/proposal_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/proposal_test.py rename to tools/mo/unit_tests/mo/ops/proposal_test.py diff --git a/tools/mo/unit_tests/extensions/ops/psroipooling_test.py b/tools/mo/unit_tests/mo/ops/psroipooling_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/psroipooling_test.py rename to tools/mo/unit_tests/mo/ops/psroipooling_test.py diff --git a/tools/mo/unit_tests/extensions/ops/quantize_test.py b/tools/mo/unit_tests/mo/ops/quantize_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/quantize_test.py rename to tools/mo/unit_tests/mo/ops/quantize_test.py diff --git a/tools/mo/unit_tests/extensions/ops/regionyolo_test.py b/tools/mo/unit_tests/mo/ops/regionyolo_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/regionyolo_test.py rename to tools/mo/unit_tests/mo/ops/regionyolo_test.py diff --git a/tools/mo/unit_tests/extensions/ops/reorgyolo_test.py b/tools/mo/unit_tests/mo/ops/reorgyolo_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/reorgyolo_test.py rename to tools/mo/unit_tests/mo/ops/reorgyolo_test.py diff --git a/tools/mo/unit_tests/extensions/ops/scatter_test.py b/tools/mo/unit_tests/mo/ops/scatter_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/scatter_test.py rename to tools/mo/unit_tests/mo/ops/scatter_test.py diff --git a/tools/mo/unit_tests/extensions/ops/scatternd_test.py b/tools/mo/unit_tests/mo/ops/scatternd_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/scatternd_test.py rename to tools/mo/unit_tests/mo/ops/scatternd_test.py diff --git a/tools/mo/unit_tests/extensions/ops/select_test.py b/tools/mo/unit_tests/mo/ops/select_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/select_test.py rename to tools/mo/unit_tests/mo/ops/select_test.py diff --git a/tools/mo/unit_tests/extensions/ops/slice_like_test.py b/tools/mo/unit_tests/mo/ops/slice_like_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/slice_like_test.py rename to tools/mo/unit_tests/mo/ops/slice_like_test.py diff --git a/tools/mo/unit_tests/extensions/ops/space_to_depth_test.py b/tools/mo/unit_tests/mo/ops/space_to_depth_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/space_to_depth_test.py rename to tools/mo/unit_tests/mo/ops/space_to_depth_test.py diff --git a/tools/mo/unit_tests/extensions/ops/sparse_fill_empty_rows_test.py b/tools/mo/unit_tests/mo/ops/sparse_fill_empty_rows_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/sparse_fill_empty_rows_test.py rename to tools/mo/unit_tests/mo/ops/sparse_fill_empty_rows_test.py diff --git a/tools/mo/unit_tests/extensions/ops/sparse_reshape_test.py b/tools/mo/unit_tests/mo/ops/sparse_reshape_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/sparse_reshape_test.py rename to tools/mo/unit_tests/mo/ops/sparse_reshape_test.py diff --git a/tools/mo/unit_tests/extensions/ops/sparse_segment_mean_test.py b/tools/mo/unit_tests/mo/ops/sparse_segment_mean_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/sparse_segment_mean_test.py rename to tools/mo/unit_tests/mo/ops/sparse_segment_mean_test.py diff --git a/tools/mo/unit_tests/extensions/ops/sparse_segment_sqrtn_test.py b/tools/mo/unit_tests/mo/ops/sparse_segment_sqrtn_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/sparse_segment_sqrtn_test.py rename to tools/mo/unit_tests/mo/ops/sparse_segment_sqrtn_test.py diff --git a/tools/mo/unit_tests/extensions/ops/sparse_segment_sum_test.py b/tools/mo/unit_tests/mo/ops/sparse_segment_sum_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/sparse_segment_sum_test.py rename to tools/mo/unit_tests/mo/ops/sparse_segment_sum_test.py diff --git a/tools/mo/unit_tests/extensions/ops/split_test.py b/tools/mo/unit_tests/mo/ops/split_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/split_test.py rename to tools/mo/unit_tests/mo/ops/split_test.py diff --git a/tools/mo/unit_tests/extensions/ops/switch_test.py b/tools/mo/unit_tests/mo/ops/switch_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/switch_test.py rename to tools/mo/unit_tests/mo/ops/switch_test.py diff --git a/tools/mo/unit_tests/extensions/ops/topk_test.py b/tools/mo/unit_tests/mo/ops/topk_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/topk_test.py rename to tools/mo/unit_tests/mo/ops/topk_test.py diff --git a/tools/mo/unit_tests/extensions/ops/transpose_test.py b/tools/mo/unit_tests/mo/ops/transpose_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/transpose_test.py rename to tools/mo/unit_tests/mo/ops/transpose_test.py diff --git a/tools/mo/unit_tests/extensions/ops/unique_test.py b/tools/mo/unit_tests/mo/ops/unique_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/unique_test.py rename to tools/mo/unit_tests/mo/ops/unique_test.py diff --git a/tools/mo/unit_tests/extensions/ops/upsample_test.py b/tools/mo/unit_tests/mo/ops/upsample_test.py similarity index 100% rename from tools/mo/unit_tests/extensions/ops/upsample_test.py rename to tools/mo/unit_tests/mo/ops/upsample_test.py