From b9e9364e5f08b1634c1228774fc3aef86254e27c Mon Sep 17 00:00:00 2001
From: Ilya Churaev <ilya.churaev@intel.com>
Date: Fri, 16 Jul 2021 08:02:07 +0300
Subject: [PATCH 1/4] Merged ONNX editor and ONNX importer to the one folder

---
 ngraph/frontend/CMakeLists.txt                |  3 +-
 ngraph/frontend/onnx/CMakeLists.txt           |  6 +++
 .../{ => onnx}/onnx_common/CMakeLists.txt     |  0
 .../include/onnx_common/parser.hpp            |  0
 .../onnx_common/include/onnx_common/utils.hpp |  0
 .../{ => onnx}/onnx_common/src/parser.cpp     |  0
 .../{ => onnx}/onnx_common/src/utils.cpp      |  0
 .../{ => onnx}/onnx_import/CMakeLists.txt     | 16 ++------
 .../include/onnx_editor/edge_mapper.hpp       |  0
 .../include/onnx_editor/editor.hpp            |  0
 .../include/onnx_editor/editor_types.hpp      |  0
 .../include/onnx_import/core/node.hpp         |  0
 .../include/onnx_import/core/operator_set.hpp |  0
 .../onnx_import/include/onnx_import/onnx.hpp  |  0
 .../onnx_import/onnx_framework_node.hpp       |  0
 .../include/onnx_import/onnx_utils.hpp        |  0
 .../utils/onnx_importer_visibility.hpp        |  0
 .../onnx_import/utils/onnx_internal.hpp       |  0
 .../onnx_import/src/core/attribute.cpp        |  0
 .../onnx_import/src/core/attribute.hpp        |  0
 .../{ => onnx}/onnx_import/src/core/graph.cpp |  0
 .../{ => onnx}/onnx_import/src/core/graph.hpp |  0
 .../onnx_import/src/core/graph_cache.cpp      |  0
 .../onnx_import/src/core/graph_cache.hpp      |  0
 .../{ => onnx}/onnx_import/src/core/model.cpp |  0
 .../{ => onnx}/onnx_import/src/core/model.hpp |  0
 .../{ => onnx}/onnx_import/src/core/node.cpp  |  0
 .../onnx_import/src/core/null_node.cpp        |  0
 .../onnx_import/src/core/null_node.hpp        |  0
 .../onnx_import/src/core/sparse_tensor.hpp    |  0
 .../onnx_import/src/core/tensor.hpp           |  0
 .../onnx_import/src/core/transform.cpp        |  0
 .../onnx_import/src/core/transform.hpp        |  0
 .../onnx_import/src/core/value_info.hpp       |  0
 .../onnx_import/src/default_opset.hpp         |  0
 .../src/detail/subgraph_extraction.cpp        |  0
 .../src/detail/subgraph_extraction.hpp        |  0
 .../onnx_import}/src/edge_mapper.cpp          |  0
 .../onnx_import}/src/editor.cpp               |  0
 .../{ => onnx}/onnx_import/src/exceptions.cpp |  0
 .../{ => onnx}/onnx_import/src/exceptions.hpp |  0
 .../{ => onnx}/onnx_import/src/onnx.cpp       |  0
 .../onnx_import/src/onnx_framework_node.cpp   |  0
 .../{ => onnx}/onnx_import/src/onnx_utils.cpp |  0
 .../{ => onnx}/onnx_import/src/op/abs.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/acos.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/acosh.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/add.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/add.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/and.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/argmax.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/argmax.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/argmin.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/argmin.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/asin.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/asinh.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/atan.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/atanh.hpp   |  0
 .../onnx_import/src/op/average_pool.cpp       |  0
 .../onnx_import/src/op/average_pool.hpp       |  0
 .../onnx_import/src/op/batch_norm.cpp         |  0
 .../onnx_import/src/op/batch_norm.hpp         |  0
 .../onnx_import/src/op/bitshift.cpp           |  0
 .../onnx_import/src/op/bitshift.hpp           |  0
 .../{ => onnx}/onnx_import/src/op/cast.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/cast.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/ceil.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/clip.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/clip.hpp    |  0
 .../onnx_import/src/op/compress.cpp           |  0
 .../onnx_import/src/op/compress.hpp           |  0
 .../{ => onnx}/onnx_import/src/op/concat.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/concat.hpp  |  0
 .../onnx_import/src/op/constant.cpp           |  0
 .../onnx_import/src/op/constant.hpp           |  0
 .../onnx_import/src/op/constant_fill.cpp      |  0
 .../onnx_import/src/op/constant_fill.hpp      |  0
 .../onnx_import/src/op/constant_of_shape.cpp  |  0
 .../onnx_import/src/op/constant_of_shape.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/conv.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/conv.hpp    |  0
 .../onnx_import/src/op/conv_integer.cpp       |  0
 .../onnx_import/src/op/conv_integer.hpp       |  0
 .../onnx_import/src/op/conv_transpose.cpp     |  0
 .../onnx_import/src/op/conv_transpose.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/cos.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/cos.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/cosh.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/cosh.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/cum_sum.cpp |  0
 .../{ => onnx}/onnx_import/src/op/cum_sum.hpp |  0
 .../onnx_import/src/op/depth_to_space.cpp     |  0
 .../onnx_import/src/op/depth_to_space.hpp     |  0
 .../onnx_import/src/op/dequantize_linear.cpp  |  0
 .../onnx_import/src/op/dequantize_linear.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/div.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/dropout.cpp |  0
 .../{ => onnx}/onnx_import/src/op/dropout.hpp |  0
 .../{ => onnx}/onnx_import/src/op/einsum.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/einsum.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/elu.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/elu.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/equal.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/erf.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/exp.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/expand.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/expand.hpp  |  0
 .../onnx_import/src/op/eye_like.cpp           |  0
 .../onnx_import/src/op/eye_like.hpp           |  0
 .../{ => onnx}/onnx_import/src/op/flatten.cpp |  0
 .../{ => onnx}/onnx_import/src/op/flatten.hpp |  0
 .../{ => onnx}/onnx_import/src/op/floor.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/gather.hpp  |  0
 .../onnx_import/src/op/gather_elements.hpp    |  0
 .../onnx_import/src/op/gather_nd.cpp          |  0
 .../onnx_import/src/op/gather_nd.hpp          |  0
 .../{ => onnx}/onnx_import/src/op/gemm.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/gemm.hpp    |  0
 .../src/op/global_average_pool.cpp            |  0
 .../src/op/global_average_pool.hpp            |  0
 .../onnx_import/src/op/global_max_pool.cpp    |  0
 .../onnx_import/src/op/global_max_pool.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/greater.hpp |  0
 .../{ => onnx}/onnx_import/src/op/gru.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/gru.hpp     |  0
 .../onnx_import/src/op/hard_sigmoid.cpp       |  0
 .../onnx_import/src/op/hard_sigmoid.hpp       |  0
 .../{ => onnx}/onnx_import/src/op/hardmax.cpp |  0
 .../{ => onnx}/onnx_import/src/op/hardmax.hpp |  0
 .../onnx_import/src/op/identity.hpp           |  0
 .../onnx_import/src/op/image_scaler.cpp       |  0
 .../onnx_import/src/op/image_scaler.hpp       |  0
 .../onnx_import/src/op/instance_norm.cpp      |  0
 .../onnx_import/src/op/instance_norm.hpp      |  0
 .../onnx_import/src/op/leaky_relu.cpp         |  0
 .../onnx_import/src/op/leaky_relu.hpp         |  0
 .../{ => onnx}/onnx_import/src/op/less.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/log.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/log.hpp     |  0
 .../onnx_import/src/op/log_softmax.cpp        |  0
 .../onnx_import/src/op/log_softmax.hpp        |  0
 .../{ => onnx}/onnx_import/src/op/loop.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/loop.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/lp_norm.cpp |  0
 .../{ => onnx}/onnx_import/src/op/lp_norm.hpp |  0
 .../{ => onnx}/onnx_import/src/op/lp_pool.cpp |  0
 .../{ => onnx}/onnx_import/src/op/lp_pool.hpp |  0
 .../{ => onnx}/onnx_import/src/op/lrn.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/lrn.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/lstm.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/lstm.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/matmul.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/max.hpp     |  0
 .../onnx_import/src/op/max_pool.cpp           |  0
 .../onnx_import/src/op/max_pool.hpp           |  0
 .../{ => onnx}/onnx_import/src/op/mean.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/mean.hpp    |  0
 .../src/op/mean_variance_normalization.cpp    |  0
 .../src/op/mean_variance_normalization.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/min.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/mod.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/mod.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/mul.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/neg.hpp     |  0
 .../src/op/non_max_suppression.cpp            |  0
 .../src/op/non_max_suppression.hpp            |  0
 .../onnx_import/src/op/non_zero.cpp           |  0
 .../onnx_import/src/op/non_zero.hpp           |  0
 .../{ => onnx}/onnx_import/src/op/not.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/onehot.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/onehot.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/or.hpp      |  0
 .../deformable_conv_2d.cpp                    |  0
 .../deformable_conv_2d.hpp                    |  0
 .../org.openvinotoolkit/detection_output.cpp  |  0
 .../org.openvinotoolkit/detection_output.hpp  |  0
 .../detection_output.cpp                      |  0
 .../detection_output.hpp                      |  0
 .../generate_proposals_single_image.cpp       |  0
 .../generate_proposals_single_image.hpp       |  0
 .../prior_grid_generator.cpp                  |  0
 .../prior_grid_generator.hpp                  |  0
 .../roi_feature_extractor.cpp                 |  0
 .../roi_feature_extractor.hpp                 |  0
 .../experimental_detectron/topk_rios.cpp      |  0
 .../experimental_detectron/topk_rios.hpp      |  0
 .../op/org.openvinotoolkit/fake_quantize.cpp  |  0
 .../op/org.openvinotoolkit/fake_quantize.hpp  |  0
 .../src/op/org.openvinotoolkit/group_norm.cpp |  0
 .../src/op/org.openvinotoolkit/group_norm.hpp |  0
 .../src/op/org.openvinotoolkit/normalize.cpp  |  0
 .../src/op/org.openvinotoolkit/normalize.hpp  |  0
 .../src/op/org.openvinotoolkit/prior_box.cpp  |  0
 .../src/op/org.openvinotoolkit/prior_box.hpp  |  0
 .../src/op/org.openvinotoolkit/swish.cpp      |  0
 .../src/op/org.openvinotoolkit/swish.hpp      |  0
 .../{ => onnx}/onnx_import/src/op/pad.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/pad.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/pow.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/pow.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/prelu.cpp   |  0
 .../{ => onnx}/onnx_import/src/op/prelu.hpp   |  0
 .../onnx_import/src/op/quant_conv.cpp         |  0
 .../onnx_import/src/op/quant_conv.hpp         |  0
 .../onnx_import/src/op/quantize_linear.cpp    |  0
 .../onnx_import/src/op/quantize_linear.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/range.cpp   |  0
 .../{ => onnx}/onnx_import/src/op/range.hpp   |  0
 .../onnx_import/src/op/reciprocal.cpp         |  0
 .../onnx_import/src/op/reciprocal.hpp         |  0
 .../{ => onnx}/onnx_import/src/op/reduce.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/reduce.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/relu.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/reshape.cpp |  0
 .../{ => onnx}/onnx_import/src/op/reshape.hpp |  0
 .../{ => onnx}/onnx_import/src/op/resize.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/resize.hpp  |  0
 .../onnx_import/src/op/reverse_sequence.cpp   |  0
 .../onnx_import/src/op/reverse_sequence.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/rnn.cpp     |  0
 .../{ => onnx}/onnx_import/src/op/rnn.hpp     |  0
 .../onnx_import/src/op/roi_align.cpp          |  0
 .../onnx_import/src/op/roi_align.hpp          |  0
 .../{ => onnx}/onnx_import/src/op/round.cpp   |  0
 .../{ => onnx}/onnx_import/src/op/round.hpp   |  0
 .../onnx_import/src/op/scatter_elements.cpp   |  0
 .../onnx_import/src/op/scatter_elements.hpp   |  0
 .../onnx_import/src/op/scatter_nd.cpp         |  0
 .../onnx_import/src/op/scatter_nd.hpp         |  0
 .../{ => onnx}/onnx_import/src/op/selu.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/selu.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/shape.cpp   |  0
 .../{ => onnx}/onnx_import/src/op/shape.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/shrink.cpp  |  0
 .../{ => onnx}/onnx_import/src/op/shrink.hpp  |  0
 .../{ => onnx}/onnx_import/src/op/sigmoid.hpp |  0
 .../{ => onnx}/onnx_import/src/op/sign.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/sin.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/sinh.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/size.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/size.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/slice.cpp   |  0
 .../{ => onnx}/onnx_import/src/op/slice.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/softmax.cpp |  0
 .../{ => onnx}/onnx_import/src/op/softmax.hpp |  0
 .../onnx_import/src/op/softplus.cpp           |  0
 .../onnx_import/src/op/softplus.hpp           |  0
 .../onnx_import/src/op/softsign.cpp           |  0
 .../onnx_import/src/op/softsign.hpp           |  0
 .../onnx_import/src/op/space_to_depth.cpp     |  0
 .../onnx_import/src/op/space_to_depth.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/split.cpp   |  0
 .../{ => onnx}/onnx_import/src/op/split.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/sqrt.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/squeeze.cpp |  0
 .../{ => onnx}/onnx_import/src/op/squeeze.hpp |  0
 .../{ => onnx}/onnx_import/src/op/sub.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/sum.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/tan.hpp     |  0
 .../{ => onnx}/onnx_import/src/op/tanh.hpp    |  0
 .../onnx_import/src/op/thresholded_relu.cpp   |  0
 .../onnx_import/src/op/thresholded_relu.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/tile.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/tile.hpp    |  0
 .../{ => onnx}/onnx_import/src/op/topk.cpp    |  0
 .../{ => onnx}/onnx_import/src/op/topk.hpp    |  0
 .../onnx_import/src/op/transpose.cpp          |  0
 .../onnx_import/src/op/transpose.hpp          |  0
 .../onnx_import/src/op/unsqueeze.cpp          |  0
 .../onnx_import/src/op/unsqueeze.hpp          |  0
 .../onnx_import/src/op/upsample.cpp           |  0
 .../onnx_import/src/op/upsample.hpp           |  0
 .../{ => onnx}/onnx_import/src/op/where.hpp   |  0
 .../{ => onnx}/onnx_import/src/op/xor.hpp     |  0
 .../{ => onnx}/onnx_import/src/ops_bridge.cpp |  0
 .../{ => onnx}/onnx_import/src/ops_bridge.hpp |  0
 .../{ => onnx}/onnx_import/src/precomp.hpp    |  0
 .../src/utils/arg_min_max_factory.cpp         |  0
 .../src/utils/arg_min_max_factory.hpp         |  0
 .../onnx_import/src/utils/common.cpp          |  0
 .../onnx_import/src/utils/common.hpp          |  0
 .../onnx_import/src/utils/convpool.cpp        |  0
 .../onnx_import/src/utils/convpool.hpp        |  0
 .../onnx_import/src/utils/onnx_internal.cpp   |  0
 .../onnx_import/src/utils/pooling_factory.cpp |  0
 .../onnx_import/src/utils/pooling_factory.hpp |  0
 .../onnx_import/src/utils/provenance_tag.cpp  |  0
 .../onnx_import/src/utils/provenance_tag.hpp  |  0
 .../onnx_import/src/utils/recurrent.cpp       |  0
 .../onnx_import/src/utils/recurrent.hpp       |  0
 .../onnx_import/src/utils/reshape.cpp         |  0
 .../onnx_import/src/utils/reshape.hpp         |  0
 .../src/utils/tensor_external_data.cpp        |  0
 .../src/utils/tensor_external_data.hpp        |  0
 .../onnx_import/src/utils/variadic.hpp        |  0
 ngraph/frontend/onnx_editor/CMakeLists.txt    | 40 -------------------
 296 files changed, 11 insertions(+), 54 deletions(-)
 create mode 100644 ngraph/frontend/onnx/CMakeLists.txt
 rename ngraph/frontend/{ => onnx}/onnx_common/CMakeLists.txt (100%)
 rename ngraph/frontend/{ => onnx}/onnx_common/include/onnx_common/parser.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_common/include/onnx_common/utils.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_common/src/parser.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_common/src/utils.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/CMakeLists.txt (79%)
 rename ngraph/frontend/{onnx_editor => onnx/onnx_import}/include/onnx_editor/edge_mapper.hpp (100%)
 rename ngraph/frontend/{onnx_editor => onnx/onnx_import}/include/onnx_editor/editor.hpp (100%)
 rename ngraph/frontend/{onnx_editor => onnx/onnx_import}/include/onnx_editor/editor_types.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/include/onnx_import/core/node.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/include/onnx_import/core/operator_set.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/include/onnx_import/onnx.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/include/onnx_import/onnx_framework_node.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/include/onnx_import/onnx_utils.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/include/onnx_import/utils/onnx_importer_visibility.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/include/onnx_import/utils/onnx_internal.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/attribute.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/attribute.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/graph.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/graph.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/graph_cache.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/graph_cache.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/model.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/model.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/node.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/null_node.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/null_node.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/sparse_tensor.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/tensor.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/transform.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/transform.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/core/value_info.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/default_opset.hpp (100%)
 rename ngraph/frontend/{onnx_editor => onnx/onnx_import}/src/detail/subgraph_extraction.cpp (100%)
 rename ngraph/frontend/{onnx_editor => onnx/onnx_import}/src/detail/subgraph_extraction.hpp (100%)
 rename ngraph/frontend/{onnx_editor => onnx/onnx_import}/src/edge_mapper.cpp (100%)
 rename ngraph/frontend/{onnx_editor => onnx/onnx_import}/src/editor.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/exceptions.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/exceptions.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/onnx.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/onnx_framework_node.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/onnx_utils.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/abs.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/acos.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/acosh.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/add.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/add.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/and.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/argmax.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/argmax.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/argmin.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/argmin.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/asin.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/asinh.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/atan.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/atanh.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/average_pool.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/average_pool.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/batch_norm.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/batch_norm.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/bitshift.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/bitshift.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/cast.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/cast.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/ceil.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/clip.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/clip.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/compress.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/compress.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/concat.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/concat.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/constant.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/constant.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/constant_fill.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/constant_fill.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/constant_of_shape.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/constant_of_shape.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/conv.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/conv.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/conv_integer.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/conv_integer.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/conv_transpose.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/conv_transpose.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/cos.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/cos.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/cosh.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/cosh.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/cum_sum.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/cum_sum.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/depth_to_space.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/depth_to_space.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/dequantize_linear.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/dequantize_linear.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/div.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/dropout.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/dropout.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/einsum.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/einsum.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/elu.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/elu.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/equal.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/erf.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/exp.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/expand.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/expand.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/eye_like.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/eye_like.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/flatten.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/flatten.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/floor.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/gather.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/gather_elements.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/gather_nd.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/gather_nd.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/gemm.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/gemm.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/global_average_pool.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/global_average_pool.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/global_max_pool.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/global_max_pool.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/greater.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/gru.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/gru.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/hard_sigmoid.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/hard_sigmoid.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/hardmax.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/hardmax.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/identity.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/image_scaler.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/image_scaler.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/instance_norm.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/instance_norm.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/leaky_relu.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/leaky_relu.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/less.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/log.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/log.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/log_softmax.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/log_softmax.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/loop.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/loop.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/lp_norm.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/lp_norm.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/lp_pool.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/lp_pool.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/lrn.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/lrn.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/lstm.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/lstm.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/matmul.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/max.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/max_pool.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/max_pool.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/mean.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/mean.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/mean_variance_normalization.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/mean_variance_normalization.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/min.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/mod.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/mod.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/mul.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/neg.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/non_max_suppression.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/non_max_suppression.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/non_zero.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/non_zero.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/not.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/onehot.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/onehot.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/or.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/detection_output.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/detection_output.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/fake_quantize.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/fake_quantize.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/group_norm.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/group_norm.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/normalize.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/normalize.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/prior_box.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/prior_box.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/swish.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/org.openvinotoolkit/swish.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/pad.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/pad.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/pow.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/pow.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/prelu.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/prelu.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/quant_conv.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/quant_conv.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/quantize_linear.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/quantize_linear.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/range.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/range.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/reciprocal.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/reciprocal.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/reduce.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/reduce.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/relu.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/reshape.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/reshape.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/resize.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/resize.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/reverse_sequence.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/reverse_sequence.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/rnn.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/rnn.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/roi_align.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/roi_align.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/round.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/round.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/scatter_elements.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/scatter_elements.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/scatter_nd.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/scatter_nd.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/selu.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/selu.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/shape.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/shape.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/shrink.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/shrink.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/sigmoid.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/sign.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/sin.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/sinh.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/size.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/size.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/slice.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/slice.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/softmax.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/softmax.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/softplus.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/softplus.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/softsign.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/softsign.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/space_to_depth.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/space_to_depth.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/split.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/split.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/sqrt.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/squeeze.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/squeeze.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/sub.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/sum.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/tan.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/tanh.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/thresholded_relu.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/thresholded_relu.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/tile.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/tile.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/topk.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/topk.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/transpose.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/transpose.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/unsqueeze.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/unsqueeze.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/upsample.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/upsample.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/where.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/op/xor.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/ops_bridge.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/ops_bridge.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/precomp.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/arg_min_max_factory.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/arg_min_max_factory.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/common.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/common.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/convpool.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/convpool.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/onnx_internal.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/pooling_factory.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/pooling_factory.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/provenance_tag.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/provenance_tag.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/recurrent.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/recurrent.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/reshape.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/reshape.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/tensor_external_data.cpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/tensor_external_data.hpp (100%)
 rename ngraph/frontend/{ => onnx}/onnx_import/src/utils/variadic.hpp (100%)
 delete mode 100644 ngraph/frontend/onnx_editor/CMakeLists.txt

diff --git a/ngraph/frontend/CMakeLists.txt b/ngraph/frontend/CMakeLists.txt
index ae62678e9d7a66..7bf186dd1ad7ba 100644
--- a/ngraph/frontend/CMakeLists.txt
+++ b/ngraph/frontend/CMakeLists.txt
@@ -7,8 +7,7 @@ set(FRONTEND_INSTALL_INCLUDE "${NGRAPH_INSTALL_INCLUDE}/ngraph/frontend")
 add_subdirectory(frontend_manager)
 
 if (NGRAPH_ONNX_IMPORT_ENABLE)
-    add_subdirectory(onnx_common)
-    add_subdirectory(onnx_import)
+    add_subdirectory(onnx)
 endif()
 
 if (NGRAPH_PDPD_FRONTEND_ENABLE)
diff --git a/ngraph/frontend/onnx/CMakeLists.txt b/ngraph/frontend/onnx/CMakeLists.txt
new file mode 100644
index 00000000000000..3327ff61b08e0e
--- /dev/null
+++ b/ngraph/frontend/onnx/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (C) 2018-2021 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_subdirectory(onnx_common)
+add_subdirectory(onnx_import)
diff --git a/ngraph/frontend/onnx_common/CMakeLists.txt b/ngraph/frontend/onnx/onnx_common/CMakeLists.txt
similarity index 100%
rename from ngraph/frontend/onnx_common/CMakeLists.txt
rename to ngraph/frontend/onnx/onnx_common/CMakeLists.txt
diff --git a/ngraph/frontend/onnx_common/include/onnx_common/parser.hpp b/ngraph/frontend/onnx/onnx_common/include/onnx_common/parser.hpp
similarity index 100%
rename from ngraph/frontend/onnx_common/include/onnx_common/parser.hpp
rename to ngraph/frontend/onnx/onnx_common/include/onnx_common/parser.hpp
diff --git a/ngraph/frontend/onnx_common/include/onnx_common/utils.hpp b/ngraph/frontend/onnx/onnx_common/include/onnx_common/utils.hpp
similarity index 100%
rename from ngraph/frontend/onnx_common/include/onnx_common/utils.hpp
rename to ngraph/frontend/onnx/onnx_common/include/onnx_common/utils.hpp
diff --git a/ngraph/frontend/onnx_common/src/parser.cpp b/ngraph/frontend/onnx/onnx_common/src/parser.cpp
similarity index 100%
rename from ngraph/frontend/onnx_common/src/parser.cpp
rename to ngraph/frontend/onnx/onnx_common/src/parser.cpp
diff --git a/ngraph/frontend/onnx_common/src/utils.cpp b/ngraph/frontend/onnx/onnx_common/src/utils.cpp
similarity index 100%
rename from ngraph/frontend/onnx_common/src/utils.cpp
rename to ngraph/frontend/onnx/onnx_common/src/utils.cpp
diff --git a/ngraph/frontend/onnx_import/CMakeLists.txt b/ngraph/frontend/onnx/onnx_import/CMakeLists.txt
similarity index 79%
rename from ngraph/frontend/onnx_import/CMakeLists.txt
rename to ngraph/frontend/onnx/onnx_import/CMakeLists.txt
index f3ef5e8c68d2b5..705f7f4d3b0d35 100644
--- a/ngraph/frontend/onnx_import/CMakeLists.txt
+++ b/ngraph/frontend/onnx/onnx_import/CMakeLists.txt
@@ -9,10 +9,6 @@ file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
 file(GLOB_RECURSE LIBRARY_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
 
-file(GLOB_RECURSE EDITOR_LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../onnx_editor/src/*.cpp)
-file(GLOB_RECURSE EDITOR_LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../onnx_editor/src/*.hpp)
-file(GLOB_RECURSE EDITOR_LIBRARY_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../onnx_editor/include/*.hpp)
-
 # Remove disabled ops
 list(REMOVE_ITEM LIBRARY_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/src/op/conv_integer.cpp
@@ -28,13 +24,12 @@ set(ONNX_IMPORT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 # Create named folders for the sources within the .vcproj
 # Empty name lists them directly under the .vcproj
 
-source_group("src" FILES ${LIBRARY_SRC} ${EDITOR_LIBRARY_SRC})
-source_group("include" FILES ${LIBRARY_HEADERS} ${EDITOR_LIBRARY_HEADERS})
-source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS} ${EDITOR_LIBRARY_PUBLIC_HEADERS})
+source_group("src" FILES ${LIBRARY_SRC})
+source_group("include" FILES ${LIBRARY_HEADERS})
+source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS})
 
 # Create shared library
-add_library(onnx_importer SHARED ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS}
-                                 ${EDITOR_LIBRARY_SRC} ${EDITOR_LIBRARY_HEADERS} ${EDITOR_LIBRARY_PUBLIC_HEADERS})
+add_library(onnx_importer SHARED ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS})
 add_library(ngraph::onnx_importer ALIAS onnx_importer)
 
 add_clang_format_target(onnx_importer_clang FOR_TARGETS onnx_importer)
@@ -61,9 +56,6 @@ target_include_directories(onnx_importer PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
 
 target_compile_definitions(onnx_importer PRIVATE ONNX_OPSET_VERSION=${ONNX_OPSET_VERSION})
 
-set(ONNX_EDITOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../onnx_editor/include)
-set(ONNX_EDITOR_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../onnx_editor/src)
-
 target_include_directories(onnx_importer PUBLIC $<BUILD_INTERFACE:${ONNX_EDITOR_INCLUDE_DIR}>)
 target_include_directories(onnx_importer PRIVATE ${ONNX_EDITOR_SRC_DIR})
 
diff --git a/ngraph/frontend/onnx_editor/include/onnx_editor/edge_mapper.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_editor/edge_mapper.hpp
similarity index 100%
rename from ngraph/frontend/onnx_editor/include/onnx_editor/edge_mapper.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_editor/edge_mapper.hpp
diff --git a/ngraph/frontend/onnx_editor/include/onnx_editor/editor.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_editor/editor.hpp
similarity index 100%
rename from ngraph/frontend/onnx_editor/include/onnx_editor/editor.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_editor/editor.hpp
diff --git a/ngraph/frontend/onnx_editor/include/onnx_editor/editor_types.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_editor/editor_types.hpp
similarity index 100%
rename from ngraph/frontend/onnx_editor/include/onnx_editor/editor_types.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_editor/editor_types.hpp
diff --git a/ngraph/frontend/onnx_import/include/onnx_import/core/node.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_import/core/node.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/include/onnx_import/core/node.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_import/core/node.hpp
diff --git a/ngraph/frontend/onnx_import/include/onnx_import/core/operator_set.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_import/core/operator_set.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/include/onnx_import/core/operator_set.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_import/core/operator_set.hpp
diff --git a/ngraph/frontend/onnx_import/include/onnx_import/onnx.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_import/onnx.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/include/onnx_import/onnx.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_import/onnx.hpp
diff --git a/ngraph/frontend/onnx_import/include/onnx_import/onnx_framework_node.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_import/onnx_framework_node.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/include/onnx_import/onnx_framework_node.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_import/onnx_framework_node.hpp
diff --git a/ngraph/frontend/onnx_import/include/onnx_import/onnx_utils.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_import/onnx_utils.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/include/onnx_import/onnx_utils.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_import/onnx_utils.hpp
diff --git a/ngraph/frontend/onnx_import/include/onnx_import/utils/onnx_importer_visibility.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_import/utils/onnx_importer_visibility.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/include/onnx_import/utils/onnx_importer_visibility.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_import/utils/onnx_importer_visibility.hpp
diff --git a/ngraph/frontend/onnx_import/include/onnx_import/utils/onnx_internal.hpp b/ngraph/frontend/onnx/onnx_import/include/onnx_import/utils/onnx_internal.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/include/onnx_import/utils/onnx_internal.hpp
rename to ngraph/frontend/onnx/onnx_import/include/onnx_import/utils/onnx_internal.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/attribute.cpp b/ngraph/frontend/onnx/onnx_import/src/core/attribute.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/attribute.cpp
rename to ngraph/frontend/onnx/onnx_import/src/core/attribute.cpp
diff --git a/ngraph/frontend/onnx_import/src/core/attribute.hpp b/ngraph/frontend/onnx/onnx_import/src/core/attribute.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/attribute.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/attribute.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/graph.cpp b/ngraph/frontend/onnx/onnx_import/src/core/graph.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/graph.cpp
rename to ngraph/frontend/onnx/onnx_import/src/core/graph.cpp
diff --git a/ngraph/frontend/onnx_import/src/core/graph.hpp b/ngraph/frontend/onnx/onnx_import/src/core/graph.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/graph.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/graph.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/graph_cache.cpp b/ngraph/frontend/onnx/onnx_import/src/core/graph_cache.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/graph_cache.cpp
rename to ngraph/frontend/onnx/onnx_import/src/core/graph_cache.cpp
diff --git a/ngraph/frontend/onnx_import/src/core/graph_cache.hpp b/ngraph/frontend/onnx/onnx_import/src/core/graph_cache.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/graph_cache.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/graph_cache.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/model.cpp b/ngraph/frontend/onnx/onnx_import/src/core/model.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/model.cpp
rename to ngraph/frontend/onnx/onnx_import/src/core/model.cpp
diff --git a/ngraph/frontend/onnx_import/src/core/model.hpp b/ngraph/frontend/onnx/onnx_import/src/core/model.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/model.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/model.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/node.cpp b/ngraph/frontend/onnx/onnx_import/src/core/node.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/node.cpp
rename to ngraph/frontend/onnx/onnx_import/src/core/node.cpp
diff --git a/ngraph/frontend/onnx_import/src/core/null_node.cpp b/ngraph/frontend/onnx/onnx_import/src/core/null_node.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/null_node.cpp
rename to ngraph/frontend/onnx/onnx_import/src/core/null_node.cpp
diff --git a/ngraph/frontend/onnx_import/src/core/null_node.hpp b/ngraph/frontend/onnx/onnx_import/src/core/null_node.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/null_node.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/null_node.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/sparse_tensor.hpp b/ngraph/frontend/onnx/onnx_import/src/core/sparse_tensor.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/sparse_tensor.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/sparse_tensor.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/tensor.hpp b/ngraph/frontend/onnx/onnx_import/src/core/tensor.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/tensor.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/tensor.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/transform.cpp b/ngraph/frontend/onnx/onnx_import/src/core/transform.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/transform.cpp
rename to ngraph/frontend/onnx/onnx_import/src/core/transform.cpp
diff --git a/ngraph/frontend/onnx_import/src/core/transform.hpp b/ngraph/frontend/onnx/onnx_import/src/core/transform.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/transform.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/transform.hpp
diff --git a/ngraph/frontend/onnx_import/src/core/value_info.hpp b/ngraph/frontend/onnx/onnx_import/src/core/value_info.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/core/value_info.hpp
rename to ngraph/frontend/onnx/onnx_import/src/core/value_info.hpp
diff --git a/ngraph/frontend/onnx_import/src/default_opset.hpp b/ngraph/frontend/onnx/onnx_import/src/default_opset.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/default_opset.hpp
rename to ngraph/frontend/onnx/onnx_import/src/default_opset.hpp
diff --git a/ngraph/frontend/onnx_editor/src/detail/subgraph_extraction.cpp b/ngraph/frontend/onnx/onnx_import/src/detail/subgraph_extraction.cpp
similarity index 100%
rename from ngraph/frontend/onnx_editor/src/detail/subgraph_extraction.cpp
rename to ngraph/frontend/onnx/onnx_import/src/detail/subgraph_extraction.cpp
diff --git a/ngraph/frontend/onnx_editor/src/detail/subgraph_extraction.hpp b/ngraph/frontend/onnx/onnx_import/src/detail/subgraph_extraction.hpp
similarity index 100%
rename from ngraph/frontend/onnx_editor/src/detail/subgraph_extraction.hpp
rename to ngraph/frontend/onnx/onnx_import/src/detail/subgraph_extraction.hpp
diff --git a/ngraph/frontend/onnx_editor/src/edge_mapper.cpp b/ngraph/frontend/onnx/onnx_import/src/edge_mapper.cpp
similarity index 100%
rename from ngraph/frontend/onnx_editor/src/edge_mapper.cpp
rename to ngraph/frontend/onnx/onnx_import/src/edge_mapper.cpp
diff --git a/ngraph/frontend/onnx_editor/src/editor.cpp b/ngraph/frontend/onnx/onnx_import/src/editor.cpp
similarity index 100%
rename from ngraph/frontend/onnx_editor/src/editor.cpp
rename to ngraph/frontend/onnx/onnx_import/src/editor.cpp
diff --git a/ngraph/frontend/onnx_import/src/exceptions.cpp b/ngraph/frontend/onnx/onnx_import/src/exceptions.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/exceptions.cpp
rename to ngraph/frontend/onnx/onnx_import/src/exceptions.cpp
diff --git a/ngraph/frontend/onnx_import/src/exceptions.hpp b/ngraph/frontend/onnx/onnx_import/src/exceptions.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/exceptions.hpp
rename to ngraph/frontend/onnx/onnx_import/src/exceptions.hpp
diff --git a/ngraph/frontend/onnx_import/src/onnx.cpp b/ngraph/frontend/onnx/onnx_import/src/onnx.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/onnx.cpp
rename to ngraph/frontend/onnx/onnx_import/src/onnx.cpp
diff --git a/ngraph/frontend/onnx_import/src/onnx_framework_node.cpp b/ngraph/frontend/onnx/onnx_import/src/onnx_framework_node.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/onnx_framework_node.cpp
rename to ngraph/frontend/onnx/onnx_import/src/onnx_framework_node.cpp
diff --git a/ngraph/frontend/onnx_import/src/onnx_utils.cpp b/ngraph/frontend/onnx/onnx_import/src/onnx_utils.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/onnx_utils.cpp
rename to ngraph/frontend/onnx/onnx_import/src/onnx_utils.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/abs.hpp b/ngraph/frontend/onnx/onnx_import/src/op/abs.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/abs.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/abs.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/acos.hpp b/ngraph/frontend/onnx/onnx_import/src/op/acos.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/acos.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/acos.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/acosh.hpp b/ngraph/frontend/onnx/onnx_import/src/op/acosh.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/acosh.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/acosh.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/add.cpp b/ngraph/frontend/onnx/onnx_import/src/op/add.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/add.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/add.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/add.hpp b/ngraph/frontend/onnx/onnx_import/src/op/add.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/add.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/add.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/and.hpp b/ngraph/frontend/onnx/onnx_import/src/op/and.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/and.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/and.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/argmax.cpp b/ngraph/frontend/onnx/onnx_import/src/op/argmax.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/argmax.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/argmax.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/argmax.hpp b/ngraph/frontend/onnx/onnx_import/src/op/argmax.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/argmax.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/argmax.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/argmin.cpp b/ngraph/frontend/onnx/onnx_import/src/op/argmin.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/argmin.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/argmin.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/argmin.hpp b/ngraph/frontend/onnx/onnx_import/src/op/argmin.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/argmin.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/argmin.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/asin.hpp b/ngraph/frontend/onnx/onnx_import/src/op/asin.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/asin.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/asin.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/asinh.hpp b/ngraph/frontend/onnx/onnx_import/src/op/asinh.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/asinh.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/asinh.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/atan.hpp b/ngraph/frontend/onnx/onnx_import/src/op/atan.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/atan.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/atan.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/atanh.hpp b/ngraph/frontend/onnx/onnx_import/src/op/atanh.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/atanh.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/atanh.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/average_pool.cpp b/ngraph/frontend/onnx/onnx_import/src/op/average_pool.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/average_pool.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/average_pool.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/average_pool.hpp b/ngraph/frontend/onnx/onnx_import/src/op/average_pool.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/average_pool.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/average_pool.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/batch_norm.cpp b/ngraph/frontend/onnx/onnx_import/src/op/batch_norm.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/batch_norm.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/batch_norm.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/batch_norm.hpp b/ngraph/frontend/onnx/onnx_import/src/op/batch_norm.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/batch_norm.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/batch_norm.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/bitshift.cpp b/ngraph/frontend/onnx/onnx_import/src/op/bitshift.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/bitshift.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/bitshift.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/bitshift.hpp b/ngraph/frontend/onnx/onnx_import/src/op/bitshift.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/bitshift.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/bitshift.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/cast.cpp b/ngraph/frontend/onnx/onnx_import/src/op/cast.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/cast.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/cast.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/cast.hpp b/ngraph/frontend/onnx/onnx_import/src/op/cast.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/cast.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/cast.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/ceil.hpp b/ngraph/frontend/onnx/onnx_import/src/op/ceil.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/ceil.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/ceil.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/clip.cpp b/ngraph/frontend/onnx/onnx_import/src/op/clip.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/clip.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/clip.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/clip.hpp b/ngraph/frontend/onnx/onnx_import/src/op/clip.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/clip.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/clip.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/compress.cpp b/ngraph/frontend/onnx/onnx_import/src/op/compress.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/compress.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/compress.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/compress.hpp b/ngraph/frontend/onnx/onnx_import/src/op/compress.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/compress.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/compress.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/concat.cpp b/ngraph/frontend/onnx/onnx_import/src/op/concat.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/concat.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/concat.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/concat.hpp b/ngraph/frontend/onnx/onnx_import/src/op/concat.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/concat.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/concat.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/constant.cpp b/ngraph/frontend/onnx/onnx_import/src/op/constant.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/constant.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/constant.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/constant.hpp b/ngraph/frontend/onnx/onnx_import/src/op/constant.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/constant.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/constant.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/constant_fill.cpp b/ngraph/frontend/onnx/onnx_import/src/op/constant_fill.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/constant_fill.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/constant_fill.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/constant_fill.hpp b/ngraph/frontend/onnx/onnx_import/src/op/constant_fill.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/constant_fill.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/constant_fill.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/constant_of_shape.cpp b/ngraph/frontend/onnx/onnx_import/src/op/constant_of_shape.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/constant_of_shape.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/constant_of_shape.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/constant_of_shape.hpp b/ngraph/frontend/onnx/onnx_import/src/op/constant_of_shape.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/constant_of_shape.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/constant_of_shape.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/conv.cpp b/ngraph/frontend/onnx/onnx_import/src/op/conv.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/conv.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/conv.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/conv.hpp b/ngraph/frontend/onnx/onnx_import/src/op/conv.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/conv.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/conv.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/conv_integer.cpp b/ngraph/frontend/onnx/onnx_import/src/op/conv_integer.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/conv_integer.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/conv_integer.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/conv_integer.hpp b/ngraph/frontend/onnx/onnx_import/src/op/conv_integer.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/conv_integer.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/conv_integer.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/conv_transpose.cpp b/ngraph/frontend/onnx/onnx_import/src/op/conv_transpose.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/conv_transpose.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/conv_transpose.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/conv_transpose.hpp b/ngraph/frontend/onnx/onnx_import/src/op/conv_transpose.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/conv_transpose.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/conv_transpose.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/cos.cpp b/ngraph/frontend/onnx/onnx_import/src/op/cos.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/cos.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/cos.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/cos.hpp b/ngraph/frontend/onnx/onnx_import/src/op/cos.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/cos.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/cos.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/cosh.cpp b/ngraph/frontend/onnx/onnx_import/src/op/cosh.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/cosh.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/cosh.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/cosh.hpp b/ngraph/frontend/onnx/onnx_import/src/op/cosh.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/cosh.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/cosh.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/cum_sum.cpp b/ngraph/frontend/onnx/onnx_import/src/op/cum_sum.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/cum_sum.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/cum_sum.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/cum_sum.hpp b/ngraph/frontend/onnx/onnx_import/src/op/cum_sum.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/cum_sum.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/cum_sum.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/depth_to_space.cpp b/ngraph/frontend/onnx/onnx_import/src/op/depth_to_space.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/depth_to_space.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/depth_to_space.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/depth_to_space.hpp b/ngraph/frontend/onnx/onnx_import/src/op/depth_to_space.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/depth_to_space.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/depth_to_space.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/dequantize_linear.cpp b/ngraph/frontend/onnx/onnx_import/src/op/dequantize_linear.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/dequantize_linear.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/dequantize_linear.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/dequantize_linear.hpp b/ngraph/frontend/onnx/onnx_import/src/op/dequantize_linear.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/dequantize_linear.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/dequantize_linear.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/div.hpp b/ngraph/frontend/onnx/onnx_import/src/op/div.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/div.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/div.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/dropout.cpp b/ngraph/frontend/onnx/onnx_import/src/op/dropout.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/dropout.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/dropout.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/dropout.hpp b/ngraph/frontend/onnx/onnx_import/src/op/dropout.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/dropout.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/dropout.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/einsum.cpp b/ngraph/frontend/onnx/onnx_import/src/op/einsum.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/einsum.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/einsum.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/einsum.hpp b/ngraph/frontend/onnx/onnx_import/src/op/einsum.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/einsum.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/einsum.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/elu.cpp b/ngraph/frontend/onnx/onnx_import/src/op/elu.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/elu.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/elu.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/elu.hpp b/ngraph/frontend/onnx/onnx_import/src/op/elu.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/elu.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/elu.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/equal.hpp b/ngraph/frontend/onnx/onnx_import/src/op/equal.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/equal.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/equal.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/erf.hpp b/ngraph/frontend/onnx/onnx_import/src/op/erf.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/erf.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/erf.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/exp.hpp b/ngraph/frontend/onnx/onnx_import/src/op/exp.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/exp.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/exp.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/expand.cpp b/ngraph/frontend/onnx/onnx_import/src/op/expand.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/expand.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/expand.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/expand.hpp b/ngraph/frontend/onnx/onnx_import/src/op/expand.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/expand.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/expand.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/eye_like.cpp b/ngraph/frontend/onnx/onnx_import/src/op/eye_like.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/eye_like.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/eye_like.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/eye_like.hpp b/ngraph/frontend/onnx/onnx_import/src/op/eye_like.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/eye_like.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/eye_like.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/flatten.cpp b/ngraph/frontend/onnx/onnx_import/src/op/flatten.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/flatten.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/flatten.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/flatten.hpp b/ngraph/frontend/onnx/onnx_import/src/op/flatten.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/flatten.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/flatten.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/floor.hpp b/ngraph/frontend/onnx/onnx_import/src/op/floor.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/floor.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/floor.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/gather.hpp b/ngraph/frontend/onnx/onnx_import/src/op/gather.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/gather.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/gather.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/gather_elements.hpp b/ngraph/frontend/onnx/onnx_import/src/op/gather_elements.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/gather_elements.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/gather_elements.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/gather_nd.cpp b/ngraph/frontend/onnx/onnx_import/src/op/gather_nd.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/gather_nd.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/gather_nd.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/gather_nd.hpp b/ngraph/frontend/onnx/onnx_import/src/op/gather_nd.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/gather_nd.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/gather_nd.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/gemm.cpp b/ngraph/frontend/onnx/onnx_import/src/op/gemm.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/gemm.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/gemm.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/gemm.hpp b/ngraph/frontend/onnx/onnx_import/src/op/gemm.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/gemm.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/gemm.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/global_average_pool.cpp b/ngraph/frontend/onnx/onnx_import/src/op/global_average_pool.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/global_average_pool.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/global_average_pool.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/global_average_pool.hpp b/ngraph/frontend/onnx/onnx_import/src/op/global_average_pool.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/global_average_pool.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/global_average_pool.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/global_max_pool.cpp b/ngraph/frontend/onnx/onnx_import/src/op/global_max_pool.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/global_max_pool.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/global_max_pool.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/global_max_pool.hpp b/ngraph/frontend/onnx/onnx_import/src/op/global_max_pool.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/global_max_pool.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/global_max_pool.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/greater.hpp b/ngraph/frontend/onnx/onnx_import/src/op/greater.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/greater.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/greater.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/gru.cpp b/ngraph/frontend/onnx/onnx_import/src/op/gru.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/gru.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/gru.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/gru.hpp b/ngraph/frontend/onnx/onnx_import/src/op/gru.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/gru.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/gru.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/hard_sigmoid.cpp b/ngraph/frontend/onnx/onnx_import/src/op/hard_sigmoid.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/hard_sigmoid.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/hard_sigmoid.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/hard_sigmoid.hpp b/ngraph/frontend/onnx/onnx_import/src/op/hard_sigmoid.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/hard_sigmoid.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/hard_sigmoid.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/hardmax.cpp b/ngraph/frontend/onnx/onnx_import/src/op/hardmax.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/hardmax.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/hardmax.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/hardmax.hpp b/ngraph/frontend/onnx/onnx_import/src/op/hardmax.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/hardmax.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/hardmax.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/identity.hpp b/ngraph/frontend/onnx/onnx_import/src/op/identity.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/identity.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/identity.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/image_scaler.cpp b/ngraph/frontend/onnx/onnx_import/src/op/image_scaler.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/image_scaler.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/image_scaler.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/image_scaler.hpp b/ngraph/frontend/onnx/onnx_import/src/op/image_scaler.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/image_scaler.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/image_scaler.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/instance_norm.cpp b/ngraph/frontend/onnx/onnx_import/src/op/instance_norm.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/instance_norm.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/instance_norm.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/instance_norm.hpp b/ngraph/frontend/onnx/onnx_import/src/op/instance_norm.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/instance_norm.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/instance_norm.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/leaky_relu.cpp b/ngraph/frontend/onnx/onnx_import/src/op/leaky_relu.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/leaky_relu.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/leaky_relu.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/leaky_relu.hpp b/ngraph/frontend/onnx/onnx_import/src/op/leaky_relu.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/leaky_relu.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/leaky_relu.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/less.hpp b/ngraph/frontend/onnx/onnx_import/src/op/less.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/less.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/less.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/log.cpp b/ngraph/frontend/onnx/onnx_import/src/op/log.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/log.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/log.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/log.hpp b/ngraph/frontend/onnx/onnx_import/src/op/log.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/log.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/log.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/log_softmax.cpp b/ngraph/frontend/onnx/onnx_import/src/op/log_softmax.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/log_softmax.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/log_softmax.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/log_softmax.hpp b/ngraph/frontend/onnx/onnx_import/src/op/log_softmax.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/log_softmax.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/log_softmax.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/loop.cpp b/ngraph/frontend/onnx/onnx_import/src/op/loop.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/loop.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/loop.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/loop.hpp b/ngraph/frontend/onnx/onnx_import/src/op/loop.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/loop.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/loop.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/lp_norm.cpp b/ngraph/frontend/onnx/onnx_import/src/op/lp_norm.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/lp_norm.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/lp_norm.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/lp_norm.hpp b/ngraph/frontend/onnx/onnx_import/src/op/lp_norm.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/lp_norm.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/lp_norm.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/lp_pool.cpp b/ngraph/frontend/onnx/onnx_import/src/op/lp_pool.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/lp_pool.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/lp_pool.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/lp_pool.hpp b/ngraph/frontend/onnx/onnx_import/src/op/lp_pool.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/lp_pool.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/lp_pool.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/lrn.cpp b/ngraph/frontend/onnx/onnx_import/src/op/lrn.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/lrn.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/lrn.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/lrn.hpp b/ngraph/frontend/onnx/onnx_import/src/op/lrn.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/lrn.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/lrn.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/lstm.cpp b/ngraph/frontend/onnx/onnx_import/src/op/lstm.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/lstm.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/lstm.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/lstm.hpp b/ngraph/frontend/onnx/onnx_import/src/op/lstm.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/lstm.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/lstm.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/matmul.hpp b/ngraph/frontend/onnx/onnx_import/src/op/matmul.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/matmul.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/matmul.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/max.hpp b/ngraph/frontend/onnx/onnx_import/src/op/max.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/max.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/max.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/max_pool.cpp b/ngraph/frontend/onnx/onnx_import/src/op/max_pool.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/max_pool.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/max_pool.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/max_pool.hpp b/ngraph/frontend/onnx/onnx_import/src/op/max_pool.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/max_pool.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/max_pool.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/mean.cpp b/ngraph/frontend/onnx/onnx_import/src/op/mean.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/mean.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/mean.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/mean.hpp b/ngraph/frontend/onnx/onnx_import/src/op/mean.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/mean.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/mean.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/mean_variance_normalization.cpp b/ngraph/frontend/onnx/onnx_import/src/op/mean_variance_normalization.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/mean_variance_normalization.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/mean_variance_normalization.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/mean_variance_normalization.hpp b/ngraph/frontend/onnx/onnx_import/src/op/mean_variance_normalization.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/mean_variance_normalization.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/mean_variance_normalization.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/min.hpp b/ngraph/frontend/onnx/onnx_import/src/op/min.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/min.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/min.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/mod.cpp b/ngraph/frontend/onnx/onnx_import/src/op/mod.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/mod.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/mod.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/mod.hpp b/ngraph/frontend/onnx/onnx_import/src/op/mod.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/mod.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/mod.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/mul.hpp b/ngraph/frontend/onnx/onnx_import/src/op/mul.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/mul.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/mul.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/neg.hpp b/ngraph/frontend/onnx/onnx_import/src/op/neg.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/neg.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/neg.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/non_max_suppression.cpp b/ngraph/frontend/onnx/onnx_import/src/op/non_max_suppression.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/non_max_suppression.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/non_max_suppression.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/non_max_suppression.hpp b/ngraph/frontend/onnx/onnx_import/src/op/non_max_suppression.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/non_max_suppression.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/non_max_suppression.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/non_zero.cpp b/ngraph/frontend/onnx/onnx_import/src/op/non_zero.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/non_zero.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/non_zero.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/non_zero.hpp b/ngraph/frontend/onnx/onnx_import/src/op/non_zero.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/non_zero.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/non_zero.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/not.hpp b/ngraph/frontend/onnx/onnx_import/src/op/not.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/not.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/not.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/onehot.cpp b/ngraph/frontend/onnx/onnx_import/src/op/onehot.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/onehot.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/onehot.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/onehot.hpp b/ngraph/frontend/onnx/onnx_import/src/op/onehot.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/onehot.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/onehot.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/or.hpp b/ngraph/frontend/onnx/onnx_import/src/op/or.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/or.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/or.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/deformable_conv_2d.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/detection_output.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/detection_output.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/detection_output.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/detection_output.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/detection_output.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/detection_output.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/detection_output.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/detection_output.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/detection_output.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/generate_proposals_single_image.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/prior_grid_generator.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/roi_feature_extractor.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/experimental_detectron/topk_rios.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/fake_quantize.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/fake_quantize.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/fake_quantize.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/fake_quantize.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/fake_quantize.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/fake_quantize.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/fake_quantize.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/fake_quantize.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/group_norm.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/group_norm.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/group_norm.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/group_norm.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/group_norm.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/group_norm.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/group_norm.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/group_norm.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/normalize.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/normalize.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/normalize.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/normalize.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/normalize.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/normalize.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/normalize.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/normalize.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/prior_box.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/prior_box.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/prior_box.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/prior_box.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/prior_box.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/prior_box.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/prior_box.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/prior_box.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/swish.cpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/swish.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/swish.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/swish.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/swish.hpp b/ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/swish.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/org.openvinotoolkit/swish.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/org.openvinotoolkit/swish.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/pad.cpp b/ngraph/frontend/onnx/onnx_import/src/op/pad.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/pad.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/pad.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/pad.hpp b/ngraph/frontend/onnx/onnx_import/src/op/pad.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/pad.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/pad.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/pow.cpp b/ngraph/frontend/onnx/onnx_import/src/op/pow.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/pow.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/pow.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/pow.hpp b/ngraph/frontend/onnx/onnx_import/src/op/pow.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/pow.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/pow.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/prelu.cpp b/ngraph/frontend/onnx/onnx_import/src/op/prelu.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/prelu.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/prelu.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/prelu.hpp b/ngraph/frontend/onnx/onnx_import/src/op/prelu.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/prelu.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/prelu.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/quant_conv.cpp b/ngraph/frontend/onnx/onnx_import/src/op/quant_conv.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/quant_conv.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/quant_conv.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/quant_conv.hpp b/ngraph/frontend/onnx/onnx_import/src/op/quant_conv.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/quant_conv.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/quant_conv.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/quantize_linear.cpp b/ngraph/frontend/onnx/onnx_import/src/op/quantize_linear.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/quantize_linear.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/quantize_linear.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/quantize_linear.hpp b/ngraph/frontend/onnx/onnx_import/src/op/quantize_linear.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/quantize_linear.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/quantize_linear.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/range.cpp b/ngraph/frontend/onnx/onnx_import/src/op/range.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/range.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/range.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/range.hpp b/ngraph/frontend/onnx/onnx_import/src/op/range.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/range.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/range.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/reciprocal.cpp b/ngraph/frontend/onnx/onnx_import/src/op/reciprocal.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/reciprocal.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/reciprocal.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/reciprocal.hpp b/ngraph/frontend/onnx/onnx_import/src/op/reciprocal.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/reciprocal.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/reciprocal.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/reduce.cpp b/ngraph/frontend/onnx/onnx_import/src/op/reduce.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/reduce.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/reduce.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/reduce.hpp b/ngraph/frontend/onnx/onnx_import/src/op/reduce.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/reduce.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/reduce.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/relu.hpp b/ngraph/frontend/onnx/onnx_import/src/op/relu.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/relu.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/relu.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/reshape.cpp b/ngraph/frontend/onnx/onnx_import/src/op/reshape.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/reshape.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/reshape.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/reshape.hpp b/ngraph/frontend/onnx/onnx_import/src/op/reshape.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/reshape.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/reshape.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/resize.cpp b/ngraph/frontend/onnx/onnx_import/src/op/resize.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/resize.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/resize.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/resize.hpp b/ngraph/frontend/onnx/onnx_import/src/op/resize.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/resize.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/resize.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/reverse_sequence.cpp b/ngraph/frontend/onnx/onnx_import/src/op/reverse_sequence.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/reverse_sequence.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/reverse_sequence.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/reverse_sequence.hpp b/ngraph/frontend/onnx/onnx_import/src/op/reverse_sequence.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/reverse_sequence.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/reverse_sequence.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/rnn.cpp b/ngraph/frontend/onnx/onnx_import/src/op/rnn.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/rnn.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/rnn.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/rnn.hpp b/ngraph/frontend/onnx/onnx_import/src/op/rnn.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/rnn.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/rnn.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/roi_align.cpp b/ngraph/frontend/onnx/onnx_import/src/op/roi_align.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/roi_align.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/roi_align.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/roi_align.hpp b/ngraph/frontend/onnx/onnx_import/src/op/roi_align.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/roi_align.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/roi_align.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/round.cpp b/ngraph/frontend/onnx/onnx_import/src/op/round.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/round.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/round.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/round.hpp b/ngraph/frontend/onnx/onnx_import/src/op/round.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/round.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/round.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/scatter_elements.cpp b/ngraph/frontend/onnx/onnx_import/src/op/scatter_elements.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/scatter_elements.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/scatter_elements.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/scatter_elements.hpp b/ngraph/frontend/onnx/onnx_import/src/op/scatter_elements.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/scatter_elements.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/scatter_elements.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/scatter_nd.cpp b/ngraph/frontend/onnx/onnx_import/src/op/scatter_nd.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/scatter_nd.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/scatter_nd.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/scatter_nd.hpp b/ngraph/frontend/onnx/onnx_import/src/op/scatter_nd.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/scatter_nd.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/scatter_nd.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/selu.cpp b/ngraph/frontend/onnx/onnx_import/src/op/selu.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/selu.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/selu.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/selu.hpp b/ngraph/frontend/onnx/onnx_import/src/op/selu.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/selu.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/selu.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/shape.cpp b/ngraph/frontend/onnx/onnx_import/src/op/shape.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/shape.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/shape.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/shape.hpp b/ngraph/frontend/onnx/onnx_import/src/op/shape.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/shape.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/shape.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/shrink.cpp b/ngraph/frontend/onnx/onnx_import/src/op/shrink.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/shrink.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/shrink.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/shrink.hpp b/ngraph/frontend/onnx/onnx_import/src/op/shrink.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/shrink.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/shrink.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/sigmoid.hpp b/ngraph/frontend/onnx/onnx_import/src/op/sigmoid.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/sigmoid.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/sigmoid.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/sign.hpp b/ngraph/frontend/onnx/onnx_import/src/op/sign.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/sign.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/sign.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/sin.hpp b/ngraph/frontend/onnx/onnx_import/src/op/sin.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/sin.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/sin.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/sinh.hpp b/ngraph/frontend/onnx/onnx_import/src/op/sinh.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/sinh.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/sinh.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/size.cpp b/ngraph/frontend/onnx/onnx_import/src/op/size.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/size.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/size.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/size.hpp b/ngraph/frontend/onnx/onnx_import/src/op/size.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/size.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/size.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/slice.cpp b/ngraph/frontend/onnx/onnx_import/src/op/slice.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/slice.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/slice.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/slice.hpp b/ngraph/frontend/onnx/onnx_import/src/op/slice.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/slice.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/slice.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/softmax.cpp b/ngraph/frontend/onnx/onnx_import/src/op/softmax.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/softmax.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/softmax.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/softmax.hpp b/ngraph/frontend/onnx/onnx_import/src/op/softmax.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/softmax.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/softmax.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/softplus.cpp b/ngraph/frontend/onnx/onnx_import/src/op/softplus.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/softplus.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/softplus.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/softplus.hpp b/ngraph/frontend/onnx/onnx_import/src/op/softplus.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/softplus.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/softplus.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/softsign.cpp b/ngraph/frontend/onnx/onnx_import/src/op/softsign.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/softsign.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/softsign.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/softsign.hpp b/ngraph/frontend/onnx/onnx_import/src/op/softsign.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/softsign.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/softsign.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/space_to_depth.cpp b/ngraph/frontend/onnx/onnx_import/src/op/space_to_depth.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/space_to_depth.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/space_to_depth.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/space_to_depth.hpp b/ngraph/frontend/onnx/onnx_import/src/op/space_to_depth.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/space_to_depth.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/space_to_depth.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/split.cpp b/ngraph/frontend/onnx/onnx_import/src/op/split.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/split.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/split.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/split.hpp b/ngraph/frontend/onnx/onnx_import/src/op/split.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/split.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/split.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/sqrt.hpp b/ngraph/frontend/onnx/onnx_import/src/op/sqrt.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/sqrt.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/sqrt.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/squeeze.cpp b/ngraph/frontend/onnx/onnx_import/src/op/squeeze.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/squeeze.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/squeeze.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/squeeze.hpp b/ngraph/frontend/onnx/onnx_import/src/op/squeeze.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/squeeze.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/squeeze.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/sub.hpp b/ngraph/frontend/onnx/onnx_import/src/op/sub.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/sub.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/sub.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/sum.hpp b/ngraph/frontend/onnx/onnx_import/src/op/sum.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/sum.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/sum.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/tan.hpp b/ngraph/frontend/onnx/onnx_import/src/op/tan.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/tan.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/tan.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/tanh.hpp b/ngraph/frontend/onnx/onnx_import/src/op/tanh.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/tanh.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/tanh.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/thresholded_relu.cpp b/ngraph/frontend/onnx/onnx_import/src/op/thresholded_relu.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/thresholded_relu.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/thresholded_relu.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/thresholded_relu.hpp b/ngraph/frontend/onnx/onnx_import/src/op/thresholded_relu.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/thresholded_relu.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/thresholded_relu.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/tile.cpp b/ngraph/frontend/onnx/onnx_import/src/op/tile.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/tile.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/tile.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/tile.hpp b/ngraph/frontend/onnx/onnx_import/src/op/tile.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/tile.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/tile.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/topk.cpp b/ngraph/frontend/onnx/onnx_import/src/op/topk.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/topk.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/topk.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/topk.hpp b/ngraph/frontend/onnx/onnx_import/src/op/topk.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/topk.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/topk.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/transpose.cpp b/ngraph/frontend/onnx/onnx_import/src/op/transpose.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/transpose.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/transpose.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/transpose.hpp b/ngraph/frontend/onnx/onnx_import/src/op/transpose.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/transpose.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/transpose.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/unsqueeze.cpp b/ngraph/frontend/onnx/onnx_import/src/op/unsqueeze.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/unsqueeze.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/unsqueeze.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/unsqueeze.hpp b/ngraph/frontend/onnx/onnx_import/src/op/unsqueeze.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/unsqueeze.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/unsqueeze.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/upsample.cpp b/ngraph/frontend/onnx/onnx_import/src/op/upsample.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/upsample.cpp
rename to ngraph/frontend/onnx/onnx_import/src/op/upsample.cpp
diff --git a/ngraph/frontend/onnx_import/src/op/upsample.hpp b/ngraph/frontend/onnx/onnx_import/src/op/upsample.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/upsample.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/upsample.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/where.hpp b/ngraph/frontend/onnx/onnx_import/src/op/where.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/where.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/where.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/xor.hpp b/ngraph/frontend/onnx/onnx_import/src/op/xor.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/op/xor.hpp
rename to ngraph/frontend/onnx/onnx_import/src/op/xor.hpp
diff --git a/ngraph/frontend/onnx_import/src/ops_bridge.cpp b/ngraph/frontend/onnx/onnx_import/src/ops_bridge.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/ops_bridge.cpp
rename to ngraph/frontend/onnx/onnx_import/src/ops_bridge.cpp
diff --git a/ngraph/frontend/onnx_import/src/ops_bridge.hpp b/ngraph/frontend/onnx/onnx_import/src/ops_bridge.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/ops_bridge.hpp
rename to ngraph/frontend/onnx/onnx_import/src/ops_bridge.hpp
diff --git a/ngraph/frontend/onnx_import/src/precomp.hpp b/ngraph/frontend/onnx/onnx_import/src/precomp.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/precomp.hpp
rename to ngraph/frontend/onnx/onnx_import/src/precomp.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/arg_min_max_factory.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/arg_min_max_factory.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/arg_min_max_factory.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/arg_min_max_factory.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/arg_min_max_factory.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/arg_min_max_factory.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/arg_min_max_factory.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/arg_min_max_factory.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/common.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/common.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/common.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/common.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/common.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/common.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/common.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/common.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/convpool.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/convpool.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/convpool.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/convpool.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/convpool.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/convpool.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/convpool.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/convpool.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/onnx_internal.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/onnx_internal.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/onnx_internal.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/onnx_internal.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/pooling_factory.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/pooling_factory.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/pooling_factory.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/pooling_factory.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/pooling_factory.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/pooling_factory.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/pooling_factory.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/pooling_factory.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/provenance_tag.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/provenance_tag.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/provenance_tag.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/provenance_tag.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/provenance_tag.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/provenance_tag.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/provenance_tag.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/provenance_tag.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/recurrent.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/recurrent.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/recurrent.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/recurrent.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/recurrent.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/recurrent.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/recurrent.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/recurrent.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/reshape.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/reshape.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/reshape.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/reshape.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/reshape.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/reshape.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/reshape.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/reshape.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/tensor_external_data.cpp b/ngraph/frontend/onnx/onnx_import/src/utils/tensor_external_data.cpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/tensor_external_data.cpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/tensor_external_data.cpp
diff --git a/ngraph/frontend/onnx_import/src/utils/tensor_external_data.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/tensor_external_data.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/tensor_external_data.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/tensor_external_data.hpp
diff --git a/ngraph/frontend/onnx_import/src/utils/variadic.hpp b/ngraph/frontend/onnx/onnx_import/src/utils/variadic.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/src/utils/variadic.hpp
rename to ngraph/frontend/onnx/onnx_import/src/utils/variadic.hpp
diff --git a/ngraph/frontend/onnx_editor/CMakeLists.txt b/ngraph/frontend/onnx_editor/CMakeLists.txt
deleted file mode 100644
index 90cf30f3c25a74..00000000000000
--- a/ngraph/frontend/onnx_editor/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2018-2021 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-#
-
-#set(TARGET_NAME "onnx_editor")
-
-#file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
-#file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
-#file(GLOB_RECURSE LIBRARY_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
-
-# Create named folders for the sources within the .vcproj
-# Empty name lists them directly under the .vcproj
-
-#source_group("src" FILES ${LIBRARY_SRC})
-#source_group("include" FILES ${LIBRARY_HEADERS})
-#source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS})
-
-# Create static library
-
-#add_library(${TARGET_NAME} OBJECT ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS})
-#add_library(ngraph::onnx_editor ALIAS ${TARGET_NAME})
-
-# TODO Add handling ie_faster_build
-
-#target_link_libraries(${TARGET_NAME} PRIVATE onnx_common
-#                                     PUBLIC ngraph)
-
-#set(ONNX_EDITOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-#set(ONNX_EDITOR_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
-
-#target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ONNX_EDITOR_INCLUDE_DIR}>
-#                                                 $<INSTALL_INTERFACE:${FRONTEND_INSTALL_INCLUDE}>)
-
-#target_include_directories(${TARGET_NAME} PRIVATE ${ONNX_EDITOR_SRC_DIR})
-
-#if(NGRAPH_USE_PROTOBUF_LITE)
-#    target_compile_definitions(${TARGET_NAME} PRIVATE NGRAPH_USE_PROTOBUF_LITE)
-#endif()
-
-#add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})

From 32037e9bc9ae83d6bb97e5eaf30117ce31151b4e Mon Sep 17 00:00:00 2001
From: Ilya Churaev <ilya.churaev@intel.com>
Date: Fri, 16 Jul 2021 08:16:06 +0300
Subject: [PATCH 2/4] Try to migrate to original ONNX

---
 .gitmodules          | 2 +-
 thirdparty/onnx/onnx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index d3f72b54c4f9c5..8aae5ad4da3d6d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,7 +40,7 @@
 	ignore = dirty
 [submodule "thirdparty/onnx"]
 	path = thirdparty/onnx/onnx
-	url = https://github.com/openvinotoolkit/onnx.git
+	url = https://github.com/onnx/onnx.git
 [submodule "thirdparty/protobuf"]
 	path = thirdparty/protobuf/protobuf
 	url = https://github.com/protocolbuffers/protobuf.git
diff --git a/thirdparty/onnx/onnx b/thirdparty/onnx/onnx
index 0807930c7f46f3..d08b3e951be607 160000
--- a/thirdparty/onnx/onnx
+++ b/thirdparty/onnx/onnx
@@ -1 +1 @@
-Subproject commit 0807930c7f46f3bac1f520c4a2e78710aa5d0af7
+Subproject commit d08b3e951be607b9638ab84c340fabec1fdbec83

From 9b81c288662371c8025eed5e247a7d361dfe008e Mon Sep 17 00:00:00 2001
From: Ilya Churaev <ilya.churaev@intel.com>
Date: Tue, 3 Aug 2021 07:26:05 +0300
Subject: [PATCH 3/4] Remove ONNX_BUILD_SHARED_LIBS

---
 thirdparty/onnx/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/thirdparty/onnx/CMakeLists.txt b/thirdparty/onnx/CMakeLists.txt
index 7915f5c4c71eae..8c9d8b6e8c60bb 100644
--- a/thirdparty/onnx/CMakeLists.txt
+++ b/thirdparty/onnx/CMakeLists.txt
@@ -19,7 +19,6 @@ macro(onnx_set_target_properties)
     target_include_directories(onnx_proto SYSTEM PRIVATE "${Protobuf_INCLUDE_DIRS}")
 
     ov_disable_all_warnings(onnx onnx_proto)
-    target_compile_definitions(onnx PUBLIC ONNX_BUILD_SHARED_LIBS)
 endmacro()
 
 set(ONNX_USE_PROTOBUF_SHARED_LIBS ${BUILD_SHARED_LIBS} CACHE BOOL "Use dynamic protobuf by ONNX library" FORCE)

From 728f3c01a58e920ce2026859f91337b456b93f97 Mon Sep 17 00:00:00 2001
From: Ilya Churaev <ilya.churaev@intel.com>
Date: Tue, 3 Aug 2021 11:21:57 +0300
Subject: [PATCH 4/4] Update ONNX

---
 thirdparty/onnx/onnx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thirdparty/onnx/onnx b/thirdparty/onnx/onnx
index d08b3e951be607..685898bc6f3fd6 160000
--- a/thirdparty/onnx/onnx
+++ b/thirdparty/onnx/onnx
@@ -1 +1 @@
-Subproject commit d08b3e951be607b9638ab84c340fabec1fdbec83
+Subproject commit 685898bc6f3fd6eb16ba129ea990f96330537e38