From: Роман Михайлович Русяев/AI Tools Lab /SRR/Staff Engineer/삼성전자 <r.rusyaev@samsung.com>
Date: Tue, 28 Aug 2018 10:08:47 +0000 (+0300)
Subject: Partial reorganize nnc file hierarchy (#1197)
X-Git-Tag: nncc_backup~2036
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5588a1f53fc9ecfbf4c1ce0963d83cd284d5b37;p=platform%2Fcore%2Fml%2Fnnfw.git

Partial reorganize nnc file hierarchy (#1197)

* reorganize modelIR part: plugin/core/... -> core/modelIR

Signed-off-by: Roman Rusyaev <r.rusyaev@samsung.com>
---

diff --git a/contrib/nnc/CMakeLists.txt b/contrib/nnc/CMakeLists.txt
index edaac86..406164c 100644
--- a/contrib/nnc/CMakeLists.txt
+++ b/contrib/nnc/CMakeLists.txt
@@ -68,8 +68,7 @@ endfunction(install_common_library)
 # Used by unit tests
 set(NNC_SOFT_BACKEND_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/soft_backend)
 set(NNC_INTERPRETER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/interpreter)
-set(NNC_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/core)
-set(NNC_PLUGIN_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/plugin)
+set(NNC_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/core)
 set(NNC_SUPPORT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/support)
 
 # driver library
@@ -87,6 +86,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/Definitions.h.in
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 
 add_subdirectory(support)
+add_subdirectory(core)
 add_subdirectory(plugin)
 add_subdirectory(examples)
 add_subdirectory(unittests)
diff --git a/contrib/nnc/core/CMakeLists.txt b/contrib/nnc/core/CMakeLists.txt
new file mode 100644
index 0000000..39afbe1
--- /dev/null
+++ b/contrib/nnc/core/CMakeLists.txt
@@ -0,0 +1,7 @@
+file(GLOB_RECURSE SOURCES "modelIR/*.cpp")
+
+add_nncc_library(nnc_core SHARED ${SOURCES})
+set_target_properties(nnc_core PROPERTIES LINKER_LANGUAGE CXX)
+
+# install nnc core library
+install_common_library(nnc_core)
diff --git a/contrib/nnc/plugin/core/src/core/linalg/Index.cpp b/contrib/nnc/core/modelIR/Index.cpp
similarity index 96%
rename from contrib/nnc/plugin/core/src/core/linalg/Index.cpp
rename to contrib/nnc/core/modelIR/Index.cpp
index 94f97b1..4e09491 100644
--- a/contrib/nnc/plugin/core/src/core/linalg/Index.cpp
+++ b/contrib/nnc/core/modelIR/Index.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/linalg/Index.h"
+#include "core/modelIR/Index.h"
 
 #include <algorithm>
 
diff --git a/contrib/nnc/plugin/core/src/core/linalg/IndexEnumerator.cpp b/contrib/nnc/core/modelIR/IndexEnumerator.cpp
similarity index 96%
rename from contrib/nnc/plugin/core/src/core/linalg/IndexEnumerator.cpp
rename to contrib/nnc/core/modelIR/IndexEnumerator.cpp
index 3953f5b..780d74d 100644
--- a/contrib/nnc/plugin/core/src/core/linalg/IndexEnumerator.cpp
+++ b/contrib/nnc/core/modelIR/IndexEnumerator.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/linalg/IndexEnumerator.h"
+#include "core/modelIR/IndexEnumerator.h"
 
 #include <cassert>
 
diff --git a/contrib/nnc/plugin/core/src/core/linalg/IndexRange.cpp b/contrib/nnc/core/modelIR/IndexRange.cpp
similarity index 90%
rename from contrib/nnc/plugin/core/src/core/linalg/IndexRange.cpp
rename to contrib/nnc/core/modelIR/IndexRange.cpp
index 59e4cfe..4578b8f 100644
--- a/contrib/nnc/plugin/core/src/core/linalg/IndexRange.cpp
+++ b/contrib/nnc/core/modelIR/IndexRange.cpp
@@ -1,5 +1,5 @@
-#include "nnc/core/linalg/IndexRange.h"
-#include "nnc/core/linalg/IndexEnumerator.h"
+#include "core/modelIR/IndexRange.h"
+#include "core/modelIR/IndexEnumerator.h"
 
 #include <cassert>
 
diff --git a/contrib/nnc/plugin/core/src/core/linalg/Reader.cpp b/contrib/nnc/core/modelIR/Reader.cpp
similarity index 74%
rename from contrib/nnc/plugin/core/src/core/linalg/Reader.cpp
rename to contrib/nnc/core/modelIR/Reader.cpp
index 3200830..983a71f 100644
--- a/contrib/nnc/plugin/core/src/core/linalg/Reader.cpp
+++ b/contrib/nnc/core/modelIR/Reader.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/linalg/Reader.h"
+#include "core/modelIR/Reader.h"
 
 // DO NOT REMOVE THIS FILE
 //
diff --git a/contrib/nnc/plugin/core/src/core/linalg/Shape.cpp b/contrib/nnc/core/modelIR/Shape.cpp
similarity index 97%
rename from contrib/nnc/plugin/core/src/core/linalg/Shape.cpp
rename to contrib/nnc/core/modelIR/Shape.cpp
index 84b4713..c02b8c9 100644
--- a/contrib/nnc/plugin/core/src/core/linalg/Shape.cpp
+++ b/contrib/nnc/core/modelIR/Shape.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Shape.h"
 
 #include <algorithm>
 
diff --git a/contrib/nnc/plugin/core/src/core/IR/model/actions/ShapeInference.cpp b/contrib/nnc/core/modelIR/ShapeInference.cpp
similarity index 90%
rename from contrib/nnc/plugin/core/src/core/IR/model/actions/ShapeInference.cpp
rename to contrib/nnc/core/modelIR/ShapeInference.cpp
index 1665e4c..c9fc137 100644
--- a/contrib/nnc/plugin/core/src/core/IR/model/actions/ShapeInference.cpp
+++ b/contrib/nnc/core/modelIR/ShapeInference.cpp
@@ -1,18 +1,18 @@
 #include <cmath>
 
-#include "nnc/core/IR/model/actions/ShapeInference.h"
-
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/variable_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
+#include "core/modelIR/ShapeInference.h"
+
+#include "core/modelIR/operations/fully_connected_op.h"
+#include "core/modelIR/operations/softmax_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/variable_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
+#include "core/modelIR/operations/reshape_op.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/src/core/linalg/Tensor.cpp b/contrib/nnc/core/modelIR/Tensor.cpp
similarity index 87%
rename from contrib/nnc/plugin/core/src/core/linalg/Tensor.cpp
rename to contrib/nnc/core/modelIR/Tensor.cpp
index c2dcebe..ba70a0d 100644
--- a/contrib/nnc/plugin/core/src/core/linalg/Tensor.cpp
+++ b/contrib/nnc/core/modelIR/Tensor.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/linalg/Tensor.h"
+#include "core/modelIR/Tensor.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/src/core/linalg/TensorVariant.cpp b/contrib/nnc/core/modelIR/TensorVariant.cpp
similarity index 95%
rename from contrib/nnc/plugin/core/src/core/linalg/TensorVariant.cpp
rename to contrib/nnc/core/modelIR/TensorVariant.cpp
index 0ebf684..d1dd39b 100644
--- a/contrib/nnc/plugin/core/src/core/linalg/TensorVariant.cpp
+++ b/contrib/nnc/core/modelIR/TensorVariant.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/TensorVariant.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/src/core/IR/model/graph/graph.cpp b/contrib/nnc/core/modelIR/graph.cpp
similarity index 92%
rename from contrib/nnc/plugin/core/src/core/IR/model/graph/graph.cpp
rename to contrib/nnc/core/modelIR/graph.cpp
index 4167992..319895e 100644
--- a/contrib/nnc/plugin/core/src/core/IR/model/graph/graph.cpp
+++ b/contrib/nnc/core/modelIR/graph.cpp
@@ -1,9 +1,9 @@
 #include <deque>
 #include <set>
 
-#include "nnc/core/IR/model/graph/graph.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
-#include "nnc/core/IR/model/operations/operation.h"
+#include "core/modelIR/graph.h"
+#include "core/modelIR/ir_node.h"
+#include "core/modelIR/operations/operation.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_builder.cpp b/contrib/nnc/core/modelIR/ir_dot_builder.cpp
similarity index 94%
rename from contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_builder.cpp
rename to contrib/nnc/core/modelIR/ir_dot_builder.cpp
index 14b4fad..a751b8a 100644
--- a/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_builder.cpp
+++ b/contrib/nnc/core/modelIR/ir_dot_builder.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/IR/dumpers/ir_dot_builder.h"
+#include "core/modelIR/ir_dot_builder.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_dumper.cpp b/contrib/nnc/core/modelIR/ir_dot_dumper.cpp
similarity index 96%
rename from contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_dumper.cpp
rename to contrib/nnc/core/modelIR/ir_dot_dumper.cpp
index b9070ff..2083537 100644
--- a/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_dumper.cpp
+++ b/contrib/nnc/core/modelIR/ir_dot_dumper.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
 
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/ir_node.h"
 
-#include "nnc/core/IR/dumpers/ir_dot_node_info.h"
-#include "nnc/core/IR/dumpers/ir_dot_dumper.h"
+#include "core/modelIR/ir_dot_node_info.h"
+#include "core/modelIR/ir_dot_dumper.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_node_info.cpp b/contrib/nnc/core/modelIR/ir_dot_node_info.cpp
similarity index 98%
rename from contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_node_info.cpp
rename to contrib/nnc/core/modelIR/ir_dot_node_info.cpp
index a538caa..de251f1 100644
--- a/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_node_info.cpp
+++ b/contrib/nnc/core/modelIR/ir_dot_node_info.cpp
@@ -1,7 +1,7 @@
 #include <sstream>
 #include <iostream>
 
-#include "nnc/core/IR/dumpers/ir_dot_node_info.h"
+#include "core/modelIR/ir_dot_node_info.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/src/core/IR/model/graph/ir_node.cpp b/contrib/nnc/core/modelIR/ir_node.cpp
similarity index 95%
rename from contrib/nnc/plugin/core/src/core/IR/model/graph/ir_node.cpp
rename to contrib/nnc/core/modelIR/ir_node.cpp
index 98cedba..e21e9d5 100644
--- a/contrib/nnc/plugin/core/src/core/IR/model/graph/ir_node.cpp
+++ b/contrib/nnc/core/modelIR/ir_node.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/IR/model/graph/ir_node.h"
+#include "core/modelIR/ir_node.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/src/core/IR/model/operations/operation.cpp b/contrib/nnc/core/modelIR/operation.cpp
similarity index 95%
rename from contrib/nnc/plugin/core/src/core/IR/model/operations/operation.cpp
rename to contrib/nnc/core/modelIR/operation.cpp
index 82d0c74..fcdd914 100644
--- a/contrib/nnc/plugin/core/src/core/IR/model/operations/operation.cpp
+++ b/contrib/nnc/core/modelIR/operation.cpp
@@ -1,6 +1,6 @@
 #include <cassert>
 
-#include "nnc/core/IR/model/operations/operation.h"
+#include "core/modelIR/operations/operation.h"
 
 namespace nncc {
 namespace contrib {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/Accessor.h b/contrib/nnc/include/core/modelIR/Accessor.h
similarity index 91%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/Accessor.h
rename to contrib/nnc/include/core/modelIR/Accessor.h
index 68993e6..bdc7511 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/Accessor.h
+++ b/contrib/nnc/include/core/modelIR/Accessor.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_LINALG_ACCESSOR_H_
 #define _NNC_CORE_LINALG_ACCESSOR_H_
 
-#include "nnc/core/linalg/Index.h"
+#include "core/modelIR/Index.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/ExternalRegion.h b/contrib/nnc/include/core/modelIR/ExternalRegion.h
similarity index 94%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/ExternalRegion.h
rename to contrib/nnc/include/core/modelIR/ExternalRegion.h
index 15b0534..c326d36 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/ExternalRegion.h
+++ b/contrib/nnc/include/core/modelIR/ExternalRegion.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_LINALG_EXTERNAL_REGION_H_
 #define _NNC_CORE_LINALG_EXTERNAL_REGION_H_
 
-#include "nnc/core/linalg/Region.h"
+#include "core/modelIR/Region.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/Index.h b/contrib/nnc/include/core/modelIR/Index.h
similarity index 100%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/Index.h
rename to contrib/nnc/include/core/modelIR/Index.h
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/IndexEnumerator.h b/contrib/nnc/include/core/modelIR/IndexEnumerator.h
similarity index 91%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/IndexEnumerator.h
rename to contrib/nnc/include/core/modelIR/IndexEnumerator.h
index 1f33bb0..9262d36 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/IndexEnumerator.h
+++ b/contrib/nnc/include/core/modelIR/IndexEnumerator.h
@@ -1,8 +1,8 @@
 #ifndef _NNC_CORE_LINALG_INDEX_ENUMERATE_H_
 #define _NNC_CORE_LINALG_INDEX_ENUMERATE_H_
 
-#include "nnc/core/linalg/Index.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Index.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/IndexRange.h b/contrib/nnc/include/core/modelIR/IndexRange.h
similarity index 86%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/IndexRange.h
rename to contrib/nnc/include/core/modelIR/IndexRange.h
index 21be71e..32b7567 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/IndexRange.h
+++ b/contrib/nnc/include/core/modelIR/IndexRange.h
@@ -1,10 +1,10 @@
 #ifndef _NNC_CORE_LINALG_INDEX_RANGE_H_
 #define _NNC_CORE_LINALG_INDEX_RANGE_H_
 
-#include "nnc/core/linalg/Index.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Index.h"
+#include "core/modelIR/Shape.h"
 
-#include "nnc/core/linalg/Iterable.h"
+#include "core/modelIR/Iterable.h"
 
 #include <functional>
 
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/Iterable.h b/contrib/nnc/include/core/modelIR/Iterable.h
similarity index 100%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/Iterable.h
rename to contrib/nnc/include/core/modelIR/Iterable.h
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/Reader.h b/contrib/nnc/include/core/modelIR/Reader.h
similarity index 91%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/Reader.h
rename to contrib/nnc/include/core/modelIR/Reader.h
index bd2547f..92b0b44 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/Reader.h
+++ b/contrib/nnc/include/core/modelIR/Reader.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_LINALG_READER_H_
 #define _NNC_CORE_LINALG_READER_H_
 
-#include "nnc/core/linalg/Index.h"
+#include "core/modelIR/Index.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/Region.h b/contrib/nnc/include/core/modelIR/Region.h
similarity index 100%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/Region.h
rename to contrib/nnc/include/core/modelIR/Region.h
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/Shape.h b/contrib/nnc/include/core/modelIR/Shape.h
similarity index 100%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/Shape.h
rename to contrib/nnc/include/core/modelIR/Shape.h
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/actions/ShapeInference.h b/contrib/nnc/include/core/modelIR/ShapeInference.h
similarity index 93%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/actions/ShapeInference.h
rename to contrib/nnc/include/core/modelIR/ShapeInference.h
index 50e3f88..d9dbce9 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/actions/ShapeInference.h
+++ b/contrib/nnc/include/core/modelIR/ShapeInference.h
@@ -2,8 +2,8 @@
 #define _NNC_CORE_IR_MODEL_SHAPE_INFERENCE_
 #include <limits>
 
-#include "nnc/core/IR/model/visitor/visitor.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
+#include "core/modelIR/visitor.h"
+#include "core/modelIR/ir_node.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/ShapeRange.h b/contrib/nnc/include/core/modelIR/ShapeRange.h
similarity index 96%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/ShapeRange.h
rename to contrib/nnc/include/core/modelIR/ShapeRange.h
index cd43dd8..301b291 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/ShapeRange.h
+++ b/contrib/nnc/include/core/modelIR/ShapeRange.h
@@ -3,8 +3,8 @@
 
 #include <cassert>
 
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/linalg/Index.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/Index.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/Tensor.h b/contrib/nnc/include/core/modelIR/Tensor.h
similarity index 85%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/Tensor.h
rename to contrib/nnc/include/core/modelIR/Tensor.h
index b6e717d..f6b1492 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/Tensor.h
+++ b/contrib/nnc/include/core/modelIR/Tensor.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/linalg/Accessor.h"
-#include "nnc/core/linalg/Reader.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/Accessor.h"
+#include "core/modelIR/Reader.h"
 
-#include "nnc/core/linalg/ExternalRegion.h"
+#include "core/modelIR/ExternalRegion.h"
 
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/TensorVariant.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/TensorUtil.h b/contrib/nnc/include/core/modelIR/TensorUtil.h
similarity index 91%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/TensorUtil.h
rename to contrib/nnc/include/core/modelIR/TensorUtil.h
index b3d2aa1..e17b5a2 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/TensorUtil.h
+++ b/contrib/nnc/include/core/modelIR/TensorUtil.h
@@ -4,10 +4,10 @@
 #include <cstring>
 #include <memory>
 
-#include "nnc/core/linalg/TensorVariant.h"
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/linalg/Index.h"
-#include "nnc/core/linalg/IndexRange.h"
+#include "core/modelIR/TensorVariant.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/Index.h"
+#include "core/modelIR/IndexRange.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/linalg/TensorVariant.h b/contrib/nnc/include/core/modelIR/TensorVariant.h
similarity index 95%
rename from contrib/nnc/plugin/core/include/nnc/core/linalg/TensorVariant.h
rename to contrib/nnc/include/core/modelIR/TensorVariant.h
index d927d2d..b43c40b 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/linalg/TensorVariant.h
+++ b/contrib/nnc/include/core/modelIR/TensorVariant.h
@@ -5,8 +5,8 @@
 #include <memory>
 #include <cassert>
 
-#include "nnc/core/linalg/Index.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Index.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc {
 namespace contrib {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/graph.h b/contrib/nnc/include/core/modelIR/graph.h
similarity index 91%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/graph.h
rename to contrib/nnc/include/core/modelIR/graph.h
index f295dd6..b36aac5 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/graph.h
+++ b/contrib/nnc/include/core/modelIR/graph.h
@@ -6,9 +6,9 @@
 #include <type_traits>
 #include <unordered_map>
 
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/IR/model/operations/variable_op.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/operations/variable_op.h"
+#include "core/modelIR/ir_node.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_builder.h b/contrib/nnc/include/core/modelIR/ir_dot_builder.h
similarity index 89%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_builder.h
rename to contrib/nnc/include/core/modelIR/ir_dot_builder.h
index abf23dc..c74633c 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_builder.h
+++ b/contrib/nnc/include/core/modelIR/ir_dot_builder.h
@@ -3,8 +3,8 @@
 
 #include <sstream>
 
-#include "nnc/core/IR/model/graph/ir_node.h"
-#include "nnc/core/IR/dumpers/ir_dot_node_info.h"
+#include "core/modelIR/ir_node.h"
+#include "core/modelIR/ir_dot_node_info.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_dumper.h b/contrib/nnc/include/core/modelIR/ir_dot_dumper.h
similarity index 64%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_dumper.h
rename to contrib/nnc/include/core/modelIR/ir_dot_dumper.h
index e285884..17829cb 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_dumper.h
+++ b/contrib/nnc/include/core/modelIR/ir_dot_dumper.h
@@ -1,21 +1,21 @@
 #ifndef _NNC_BACKEND_INTERPRETER_CORE_DOTDUMPER_
 #define _NNC_BACKEND_INTERPRETER_CORE_DOTDUMPER_
 
-#include "nnc/core/IR/model/visitor/visitor.h"
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/variable_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
-
-#include "nnc/core/IR/dumpers/ir_dot_builder.h"
+#include "core/modelIR/visitor.h"
+#include "core/modelIR/operations/fully_connected_op.h"
+#include "core/modelIR/operations/softmax_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/variable_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
+#include "core/modelIR/operations/reshape_op.h"
+
+#include "core/modelIR/ir_dot_builder.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_node_info.h b/contrib/nnc/include/core/modelIR/ir_dot_node_info.h
similarity index 95%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_node_info.h
rename to contrib/nnc/include/core/modelIR/ir_dot_node_info.h
index 49e3d72..1fdd32b 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_node_info.h
+++ b/contrib/nnc/include/core/modelIR/ir_dot_node_info.h
@@ -1,9 +1,9 @@
 #ifndef NNCC_IR_NODE_DOT_BUILDER_H
 #define NNCC_IR_NODE_DOT_BUILDER_H
 
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/IR/model/operations/common.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/operations/common.h"
+#include "core/modelIR/operations/pool_op.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/ir_node.h b/contrib/nnc/include/core/modelIR/ir_node.h
similarity index 96%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/ir_node.h
rename to contrib/nnc/include/core/modelIR/ir_node.h
index b9e3a47..a8d7948 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/ir_node.h
+++ b/contrib/nnc/include/core/modelIR/ir_node.h
@@ -5,8 +5,8 @@
 #include <vector>
 #include <iostream>
 
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/IR/model/visitor/visitor.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/visitor.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/bias_add_op.h b/contrib/nnc/include/core/modelIR/operations/bias_add_op.h
similarity index 86%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/bias_add_op.h
rename to contrib/nnc/include/core/modelIR/operations/bias_add_op.h
index dcb59b1..eef5b65 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/bias_add_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/bias_add_op.h
@@ -1,8 +1,8 @@
 #ifndef _NNC_CORE_IR_MODEL_BIAS_ADD_H_
 #define _NNC_CORE_IR_MODEL_BIAS_ADD_H_
 
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/TensorVariant.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/capped_relu_op.h b/contrib/nnc/include/core/modelIR/operations/capped_relu_op.h
similarity index 91%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/capped_relu_op.h
rename to contrib/nnc/include/core/modelIR/operations/capped_relu_op.h
index eaf88c3..43c2c3a 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/capped_relu_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/capped_relu_op.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_IR_MODEL_CAPPED_RELU_H_
 #define _NNC_CORE_IR_MODEL_CAPPED_RELU_H_
 
-#include "nnc/core/IR/model/operations/operation.h"
+#include "core/modelIR/operations/operation.h"
 
 namespace nncc {
 namespace contrib {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/common.h b/contrib/nnc/include/core/modelIR/operations/common.h
similarity index 100%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/common.h
rename to contrib/nnc/include/core/modelIR/operations/common.h
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/concat_op.h b/contrib/nnc/include/core/modelIR/operations/concat_op.h
similarity index 94%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/concat_op.h
rename to contrib/nnc/include/core/modelIR/operations/concat_op.h
index 672075f..a39031f 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/concat_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/concat_op.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_IR_MODEL_CONCAT_OP_H_
 #define _NNC_CORE_IR_MODEL_CONCAT_OP_H_
 
-#include "nnc/core/IR/model/operations/operation.h"
+#include "core/modelIR/operations/operation.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/conv_2d_op.h b/contrib/nnc/include/core/modelIR/operations/conv_2d_op.h
similarity index 85%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/conv_2d_op.h
rename to contrib/nnc/include/core/modelIR/operations/conv_2d_op.h
index 870c8d8..572eb40 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/conv_2d_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/conv_2d_op.h
@@ -3,11 +3,11 @@
 
 #include <vector>
 
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/IR/model/operations/common.h"
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/operations/common.h"
+#include "core/modelIR/TensorVariant.h"
 
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h b/contrib/nnc/include/core/modelIR/operations/depthwise_conv2d_op.h
similarity index 86%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h
rename to contrib/nnc/include/core/modelIR/operations/depthwise_conv2d_op.h
index 6894da4..b018bbe 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/depthwise_conv2d_op.h
@@ -3,11 +3,11 @@
 
 #include <vector>
 
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/linalg/TensorVariant.h"
-#include "nnc/core/IR/model/operations/common.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/TensorVariant.h"
+#include "core/modelIR/operations/common.h"
 
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/fully_connected_op.h b/contrib/nnc/include/core/modelIR/operations/fully_connected_op.h
similarity index 87%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/fully_connected_op.h
rename to contrib/nnc/include/core/modelIR/operations/fully_connected_op.h
index 5ce0ee0..42540b6 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/fully_connected_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/fully_connected_op.h
@@ -1,8 +1,8 @@
 #ifndef _NNC_CORE_IR_MODEL_FULLY_CONNECTED_OP_H_
 #define _NNC_CORE_IR_MODEL_FULLY_CONNECTED_OP_H_
 
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/TensorVariant.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/operation.h b/contrib/nnc/include/core/modelIR/operations/operation.h
similarity index 93%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/operation.h
rename to contrib/nnc/include/core/modelIR/operations/operation.h
index 482333a..448fbc2 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/operation.h
+++ b/contrib/nnc/include/core/modelIR/operations/operation.h
@@ -3,9 +3,9 @@
 
 #include <string>
 #include <map>
-#include <nnc/core/linalg/TensorVariant.h>
+#include "core/modelIR/TensorVariant.h"
 
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/pool_op.h b/contrib/nnc/include/core/modelIR/operations/pool_op.h
similarity index 90%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/pool_op.h
rename to contrib/nnc/include/core/modelIR/operations/pool_op.h
index e1e3e16..4cb6d12 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/pool_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/pool_op.h
@@ -3,10 +3,10 @@
 
 #include <vector>
 
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/IR/model/operations/common.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/operations/common.h"
 
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/relu_op.h b/contrib/nnc/include/core/modelIR/operations/relu_op.h
similarity index 89%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/relu_op.h
rename to contrib/nnc/include/core/modelIR/operations/relu_op.h
index 1dd30da..1819d4a 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/relu_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/relu_op.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_IR_MODEL_RELU_H_
 #define _NNC_CORE_IR_MODEL_RELU_H_
 
-#include "nnc/core/IR/model/operations/operation.h"
+#include "core/modelIR/operations/operation.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/reshape_op.h b/contrib/nnc/include/core/modelIR/operations/reshape_op.h
similarity index 86%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/reshape_op.h
rename to contrib/nnc/include/core/modelIR/operations/reshape_op.h
index bf65492..78c66d9 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/reshape_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/reshape_op.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nnc/core/IR/model/operations/operation.h"
+#include "core/modelIR/operations/operation.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/softmax_op.h b/contrib/nnc/include/core/modelIR/operations/softmax_op.h
similarity index 94%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/softmax_op.h
rename to contrib/nnc/include/core/modelIR/operations/softmax_op.h
index 091dcdb..0eb2a8a 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/softmax_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/softmax_op.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_IR_MODEL_SOFTMAX_H_
 #define _NNC_CORE_IR_MODEL_SOFTMAX_H_
 
-#include "nnc/core/IR/model/operations/operation.h"
+#include "core/modelIR/operations/operation.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/variable_op.h b/contrib/nnc/include/core/modelIR/operations/variable_op.h
similarity index 89%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/variable_op.h
rename to contrib/nnc/include/core/modelIR/operations/variable_op.h
index f193d3b..b8b7eb1 100644
--- a/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/variable_op.h
+++ b/contrib/nnc/include/core/modelIR/operations/variable_op.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_IR_MODEL_VARIABLE_H_
 #define _NNC_CORE_IR_MODEL_VARIABLE_H_
 
-#include "nnc/core/IR/model/operations/operation.h"
+#include "core/modelIR/operations/operation.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/core/include/nnc/core/IR/model/visitor/visitor.h b/contrib/nnc/include/core/modelIR/visitor.h
similarity index 100%
rename from contrib/nnc/plugin/core/include/nnc/core/IR/model/visitor/visitor.h
rename to contrib/nnc/include/core/modelIR/visitor.h
diff --git a/contrib/nnc/include/plugin/interpreter/Interpreter.h b/contrib/nnc/include/plugin/interpreter/Interpreter.h
index 728dbab..e2f6c45 100644
--- a/contrib/nnc/include/plugin/interpreter/Interpreter.h
+++ b/contrib/nnc/include/plugin/interpreter/Interpreter.h
@@ -6,10 +6,10 @@
 #include <string>
 #include <unordered_map>
 
-#include "nnc/core/IR/model/visitor/visitor.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
+#include "core/modelIR/visitor.h"
+#include "core/modelIR/ir_node.h"
 
-#include "nnc/core/linalg/Tensor.h"
+#include "core/modelIR/Tensor.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/CMakeLists.txt b/contrib/nnc/plugin/CMakeLists.txt
index edbff0e..32b7245 100644
--- a/contrib/nnc/plugin/CMakeLists.txt
+++ b/contrib/nnc/plugin/CMakeLists.txt
@@ -1,4 +1,3 @@
 add_subdirectory(frontend)
-add_subdirectory(core)
 add_subdirectory(interpreter)
 add_subdirectory(soft_backend)
diff --git a/contrib/nnc/plugin/core/CMakeLists.txt b/contrib/nnc/plugin/core/CMakeLists.txt
deleted file mode 100644
index 9de80f3..0000000
--- a/contrib/nnc/plugin/core/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-file(GLOB_RECURSE HEADERS "include/*.h")
-file(GLOB_RECURSE SOURCES "src/*.cpp")
-
-add_nncc_library(nnc_core SHARED ${HEADERS} ${SOURCES})
-set_target_properties(nnc_core PROPERTIES LINKER_LANGUAGE CXX)
-target_include_directories(nnc_core PUBLIC include)
-
-# install nnc core library
-install_common_library(nnc_core)
diff --git a/contrib/nnc/plugin/frontend/caffe/include/caffe_model_visitor.h b/contrib/nnc/plugin/frontend/caffe/include/caffe_model_visitor.h
index 8ffb0fd..6146333 100644
--- a/contrib/nnc/plugin/frontend/caffe/include/caffe_model_visitor.h
+++ b/contrib/nnc/plugin/frontend/caffe/include/caffe_model_visitor.h
@@ -4,9 +4,9 @@
 #include <map>
 #include <vector>
 
-#include "nnc/core/IR/model/graph/graph.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/graph.h"
+#include "core/modelIR/ir_node.h"
+#include "core/modelIR/TensorVariant.h"
 
 #include "caffe_visitor.h"
 #include "caffe_op_creator.h"
diff --git a/contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h b/contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h
index b2a257f..696151e 100644
--- a/contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h
+++ b/contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h
@@ -6,11 +6,11 @@
 #include <memory>
 
 #include "support/PluginException.h"
-#include "nnc/core/IR/model/graph/graph.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
-#include "nnc/core/linalg/TensorVariant.h"
-#include "nnc/core/IR/model/operations/common.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/graph.h"
+#include "core/modelIR/ir_node.h"
+#include "core/modelIR/TensorVariant.h"
+#include "core/modelIR/operations/common.h"
+#include "core/modelIR/Shape.h"
 
 #include "caffe/proto/caffe.pb.h"
 
diff --git a/contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp b/contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp
index 81f8779..eaa812e 100644
--- a/contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp
+++ b/contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp
@@ -1,9 +1,9 @@
 #include <vector>
 #include <cassert>
 
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/IR/model/operations/variable_op.h"
-#include "nnc/core/linalg/TensorUtil.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/operations/variable_op.h"
+#include "core/modelIR/TensorUtil.h"
 #include "support/PluginException.h"
 
 #include "shape_helper.h"
diff --git a/contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp b/contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp
index b348b9d..83c5c6d 100644
--- a/contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp
+++ b/contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp
@@ -1,13 +1,13 @@
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/softmax_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
+#include "core/modelIR/operations/reshape_op.h"
+#include "core/modelIR/operations/fully_connected_op.h"
 
 #include "shape_helper.h"
 #include "caffe_op_creator.h"
diff --git a/contrib/nnc/plugin/frontend/include/shape_helper.h b/contrib/nnc/plugin/frontend/include/shape_helper.h
index e4a1c0a..61284c7 100644
--- a/contrib/nnc/plugin/frontend/include/shape_helper.h
+++ b/contrib/nnc/plugin/frontend/include/shape_helper.h
@@ -1,7 +1,7 @@
 #ifndef NNCC_SHAPE_HELPER_H
 #define NNCC_SHAPE_HELPER_H
 
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_ir_visitor.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_ir_visitor.h
index c3dbdf6..2ee9335 100644
--- a/contrib/nnc/plugin/frontend/tflite/include/tflite_ir_visitor.h
+++ b/contrib/nnc/plugin/frontend/tflite/include/tflite_ir_visitor.h
@@ -7,9 +7,9 @@
 #include <vector>
 #include <memory>
 
-#include "nnc/core/IR/model/graph/graph.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/graph.h"
+#include "core/modelIR/ir_node.h"
+#include "core/modelIR/TensorVariant.h"
 
 #include "schema_v3.h"
 #include "tflite_visitor.h"
diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h
index 12323b3..64f3418 100644
--- a/contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h
+++ b/contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h
@@ -7,12 +7,12 @@
 #include <cstdint>
 
 #include "support/PluginException.h"
-#include "nnc/core/IR/model/graph/graph.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
-#include "nnc/core/linalg/TensorVariant.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/graph.h"
+#include "core/modelIR/ir_node.h"
+#include "core/modelIR/TensorVariant.h"
+#include "core/modelIR/Shape.h"
 
-#include "nnc/core/IR/model/operations/common.h"
+#include "core/modelIR/operations/common.h"
 
 #include "schema_v3.h"
 #include "shape_helper.h"
diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp
index 0c9b14b..b39c174 100644
--- a/contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp
+++ b/contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp
@@ -3,11 +3,11 @@
 
 #include "schema_v3.h"
 #include "support/PluginException.h"
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/linalg/Index.h"
-#include "nnc/core/linalg/IndexRange.h"
-#include "nnc/core/linalg/TensorUtil.h"
-#include "nnc/core/IR/model/operations/variable_op.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/Index.h"
+#include "core/modelIR/IndexRange.h"
+#include "core/modelIR/TensorUtil.h"
+#include "core/modelIR/operations/variable_op.h"
 
 #include "shape_helper.h"
 #include "tflite_ir_visitor.h"
diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_op_creator.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_op_creator.cpp
index d5cab37..12168a7 100644
--- a/contrib/nnc/plugin/frontend/tflite/src/tflite_op_creator.cpp
+++ b/contrib/nnc/plugin/frontend/tflite/src/tflite_op_creator.cpp
@@ -1,15 +1,15 @@
 #include "tflite_op_creator.h"
 
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/fully_connected_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/softmax_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
+#include "core/modelIR/operations/reshape_op.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/interpreter/Interpreter.cpp b/contrib/nnc/plugin/interpreter/Interpreter.cpp
index 9de9a91..502a18c 100644
--- a/contrib/nnc/plugin/interpreter/Interpreter.cpp
+++ b/contrib/nnc/plugin/interpreter/Interpreter.cpp
@@ -2,16 +2,16 @@
 
 #include "plugin/interpreter/Interpreter.h"
 
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/variable_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
+#include "core/modelIR/operations/fully_connected_op.h"
+#include "core/modelIR/operations/softmax_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/variable_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
 
 #include "ops/Bias.h"
 #include "ops/Concat.h"
diff --git a/contrib/nnc/plugin/interpreter/interpreter_plugin.cpp b/contrib/nnc/plugin/interpreter/interpreter_plugin.cpp
index 79fc076..ba553fa 100644
--- a/contrib/nnc/plugin/interpreter/interpreter_plugin.cpp
+++ b/contrib/nnc/plugin/interpreter/interpreter_plugin.cpp
@@ -12,15 +12,15 @@
 
 #include "support/PluginInstance.h"
 
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Shape.h"
 
 #include "plugin/interpreter/Interpreter.h"
 
-#include "nnc/core/IR/model/actions/ShapeInference.h"
-#include "nnc/core/IR/model/graph/graph.h"
+#include "core/modelIR/ShapeInference.h"
+#include "core/modelIR/graph.h"
 
-#include "nnc/core/linalg/ShapeRange.h"
-#include "nnc/core/linalg/Tensor.h"
+#include "core/modelIR/ShapeRange.h"
+#include "core/modelIR/Tensor.h"
 
 #include "interpreter_plugin.h"
 
diff --git a/contrib/nnc/plugin/interpreter/interpreter_plugin.h b/contrib/nnc/plugin/interpreter/interpreter_plugin.h
index bb0d950..456489a 100644
--- a/contrib/nnc/plugin/interpreter/interpreter_plugin.h
+++ b/contrib/nnc/plugin/interpreter/interpreter_plugin.h
@@ -6,8 +6,8 @@
 #include "support/PluginInstance.h"
 #include "support/PluginException.h"
 
-#include "nnc/core/linalg/TensorVariant.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/TensorVariant.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.cpp b/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.cpp
index 3c4d6e2..b0ca218 100644
--- a/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.cpp
+++ b/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/linalg/ShapeRange.h"
+#include "core/modelIR/ShapeRange.h"
 
 #include "Depthwise_conv_2D.h"
 #include "common.h"
diff --git a/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.h b/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.h
index 9ca2ee3..8598dde 100644
--- a/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.h
+++ b/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.h
@@ -3,8 +3,8 @@
 
 #include "OperationImpl.h"
 
-#include "nnc/core/IR/model/operations/common.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/common.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/interpreter/ops/Elementwise.h b/contrib/nnc/plugin/interpreter/ops/Elementwise.h
index 7a4768d..00f58f7 100644
--- a/contrib/nnc/plugin/interpreter/ops/Elementwise.h
+++ b/contrib/nnc/plugin/interpreter/ops/Elementwise.h
@@ -1,8 +1,8 @@
 #ifndef _NNC_CORE_BACKEND_INTERPRETER_ELEMENTWISE_IMPL_
 #define _NNC_CORE_BACKEND_INTERPRETER_ELEMENTWISE_IMPL_
 
-#include "nnc/core/linalg/ShapeRange.h"
-#include "nnc/core/linalg/Tensor.h"
+#include "core/modelIR/ShapeRange.h"
+#include "core/modelIR/Tensor.h"
 
 #include "OperationImpl.h"
 
diff --git a/contrib/nnc/plugin/interpreter/ops/FullyConnected.h b/contrib/nnc/plugin/interpreter/ops/FullyConnected.h
index 7f1d234..bddce5d 100644
--- a/contrib/nnc/plugin/interpreter/ops/FullyConnected.h
+++ b/contrib/nnc/plugin/interpreter/ops/FullyConnected.h
@@ -1,8 +1,8 @@
 #ifndef _NNC_CORE_BACKEND_INTERPRETER_FULLYCONNECTED_
 #define _NNC_CORE_BACKEND_INTERPRETER_FULLYCONNECTED_
 
-#include "nnc/core/linalg/ShapeRange.h"
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
+#include "core/modelIR/ShapeRange.h"
+#include "core/modelIR/operations/fully_connected_op.h"
 #include "OperationImpl.h"
 
 namespace nncc
diff --git a/contrib/nnc/plugin/interpreter/ops/OperationImpl.h b/contrib/nnc/plugin/interpreter/ops/OperationImpl.h
index 84b6743..6d0b548 100644
--- a/contrib/nnc/plugin/interpreter/ops/OperationImpl.h
+++ b/contrib/nnc/plugin/interpreter/ops/OperationImpl.h
@@ -3,10 +3,10 @@
 
 #include <vector>
 
-#include "nnc/core/linalg/Tensor.h"
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/Tensor.h"
+#include "core/modelIR/TensorVariant.h"
 
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/interpreter/ops/Pool.cpp b/contrib/nnc/plugin/interpreter/ops/Pool.cpp
index ab8b215..8e488f7 100644
--- a/contrib/nnc/plugin/interpreter/ops/Pool.cpp
+++ b/contrib/nnc/plugin/interpreter/ops/Pool.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <limits>
 
-#include "nnc/core/linalg/ShapeRange.h"
+#include "core/modelIR/ShapeRange.h"
 
 #include "Pool.h"
 #include "common.h"
diff --git a/contrib/nnc/plugin/interpreter/ops/Pool.h b/contrib/nnc/plugin/interpreter/ops/Pool.h
index 96f2d12..9884404 100644
--- a/contrib/nnc/plugin/interpreter/ops/Pool.h
+++ b/contrib/nnc/plugin/interpreter/ops/Pool.h
@@ -2,8 +2,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_POOL_
 
 #include "OperationImpl.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/common.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/common.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/interpreter/ops/Reduce.h b/contrib/nnc/plugin/interpreter/ops/Reduce.h
index e349553..1bfe3c2 100644
--- a/contrib/nnc/plugin/interpreter/ops/Reduce.h
+++ b/contrib/nnc/plugin/interpreter/ops/Reduce.h
@@ -3,8 +3,8 @@
 
 #include <functional>
 
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/linalg/Tensor.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/Tensor.h"
 
 #include "OperationImpl.h"
 #include "Fill.h"
diff --git a/contrib/nnc/plugin/interpreter/ops/Reshape.h b/contrib/nnc/plugin/interpreter/ops/Reshape.h
index db4d39f..49a1598 100644
--- a/contrib/nnc/plugin/interpreter/ops/Reshape.h
+++ b/contrib/nnc/plugin/interpreter/ops/Reshape.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_CORE_BACKEND_INTERPRETER_RESHAPE_IMPL_
 #define _NNC_CORE_BACKEND_INTERPRETER_RESHAPE_IMPL_
 
-#include "nnc/core/IR/model/operations/reshape_op.h"
+#include "core/modelIR/operations/reshape_op.h"
 
 #include "OperationImpl.h"
 #include "Fill.h"
diff --git a/contrib/nnc/plugin/interpreter/ops/Softmax.h b/contrib/nnc/plugin/interpreter/ops/Softmax.h
index 8927963..49245cc 100644
--- a/contrib/nnc/plugin/interpreter/ops/Softmax.h
+++ b/contrib/nnc/plugin/interpreter/ops/Softmax.h
@@ -3,8 +3,8 @@
 
 #include <cmath>
 
-#include "nnc/core/linalg/ShapeRange.h"
-#include "nnc/core/linalg/Tensor.h"
+#include "core/modelIR/ShapeRange.h"
+#include "core/modelIR/Tensor.h"
 
 #include "OperationImpl.h"
 #include "Elementwise.h"
diff --git a/contrib/nnc/plugin/interpreter/ops/common.h b/contrib/nnc/plugin/interpreter/ops/common.h
index 549a5dd..af03c69 100644
--- a/contrib/nnc/plugin/interpreter/ops/common.h
+++ b/contrib/nnc/plugin/interpreter/ops/common.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "nnc/core/linalg/Index.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Index.h"
+#include "core/modelIR/Shape.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/interpreter/ops/conv_2D.cpp b/contrib/nnc/plugin/interpreter/ops/conv_2D.cpp
index db910f5..628ec57 100644
--- a/contrib/nnc/plugin/interpreter/ops/conv_2D.cpp
+++ b/contrib/nnc/plugin/interpreter/ops/conv_2D.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
 
-#include "nnc/core/linalg/ShapeRange.h"
+#include "core/modelIR/ShapeRange.h"
 
 #include "conv_2D.h"
 #include "common.h"
diff --git a/contrib/nnc/plugin/interpreter/ops/conv_2D.h b/contrib/nnc/plugin/interpreter/ops/conv_2D.h
index bf6e671..33cc580 100644
--- a/contrib/nnc/plugin/interpreter/ops/conv_2D.h
+++ b/contrib/nnc/plugin/interpreter/ops/conv_2D.h
@@ -2,7 +2,7 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_CONV2D_IMPL_
 
 #include "OperationImpl.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/interpreter/ops/conv_FFT.cpp b/contrib/nnc/plugin/interpreter/ops/conv_FFT.cpp
index 50a0692..8b81075 100644
--- a/contrib/nnc/plugin/interpreter/ops/conv_FFT.cpp
+++ b/contrib/nnc/plugin/interpreter/ops/conv_FFT.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
 
-#include "nnc/core/linalg/ShapeRange.h"
+#include "core/modelIR/ShapeRange.h"
 
 #include "conv_FFT.h"
 #include "common.h"
diff --git a/contrib/nnc/plugin/interpreter/ops/conv_FFT.h b/contrib/nnc/plugin/interpreter/ops/conv_FFT.h
index 73fc25e..07a263c 100644
--- a/contrib/nnc/plugin/interpreter/ops/conv_FFT.h
+++ b/contrib/nnc/plugin/interpreter/ops/conv_FFT.h
@@ -26,7 +26,7 @@
 #include <complex>
 
 #include "OperationImpl.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
 
 namespace nncc
 {
diff --git a/contrib/nnc/plugin/soft_backend/base_generator.cpp b/contrib/nnc/plugin/soft_backend/base_generator.cpp
index 385ba53..7fac842 100644
--- a/contrib/nnc/plugin/soft_backend/base_generator.cpp
+++ b/contrib/nnc/plugin/soft_backend/base_generator.cpp
@@ -2,7 +2,7 @@
 #include "model_analyzer.h"
 #include "serializer.h"
 #include "support/PluginException.h"
-#include "nnc/core/IR/model/actions/ShapeInference.h"
+#include "core/modelIR/ShapeInference.h"
 #include "option/Options.h"
 
 #include "param_constants.def"
diff --git a/contrib/nnc/plugin/soft_backend/base_generator.h b/contrib/nnc/plugin/soft_backend/base_generator.h
index 9b91db6..dc2266e 100644
--- a/contrib/nnc/plugin/soft_backend/base_generator.h
+++ b/contrib/nnc/plugin/soft_backend/base_generator.h
@@ -1,7 +1,7 @@
 #ifndef _NNC_SOFT_BACKEND_BASE_GENERATOR_H_
 #define _NNC_SOFT_BACKEND_BASE_GENERATOR_H_
 
-#include "nnc/core/IR/model/graph/graph.h"
+#include "core/modelIR/graph.h"
 
 #include <string>
 #include <ostream>
diff --git a/contrib/nnc/plugin/soft_backend/model_analyzer.cpp b/contrib/nnc/plugin/soft_backend/model_analyzer.cpp
index 323a8f1..deb2821 100644
--- a/contrib/nnc/plugin/soft_backend/model_analyzer.cpp
+++ b/contrib/nnc/plugin/soft_backend/model_analyzer.cpp
@@ -2,20 +2,20 @@
 #include <limits>
 
 #include "model_analyzer.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/linalg/ShapeRange.h"
-
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
+#include "core/modelIR/ir_node.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/ShapeRange.h"
+
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/softmax_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/fully_connected_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/reshape_op.h"
 
 using namespace std;
 
diff --git a/contrib/nnc/plugin/soft_backend/model_analyzer.h b/contrib/nnc/plugin/soft_backend/model_analyzer.h
index 5848e3f..d9eafa5 100644
--- a/contrib/nnc/plugin/soft_backend/model_analyzer.h
+++ b/contrib/nnc/plugin/soft_backend/model_analyzer.h
@@ -1,9 +1,9 @@
 #ifndef _NNC_SOFT_BACKEND_MODEL_ANALYZER_H_
 #define _NNC_SOFT_BACKEND_MODEL_ANALYZER_H_
 
-#include "nnc/core/IR/model/visitor/visitor.h"
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/visitor.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/TensorVariant.h"
 
 #include <vector>
 #include <list>
diff --git a/contrib/nnc/plugin/soft_backend/serializer.cpp b/contrib/nnc/plugin/soft_backend/serializer.cpp
index 4c1c05f..a272b91 100644
--- a/contrib/nnc/plugin/soft_backend/serializer.cpp
+++ b/contrib/nnc/plugin/soft_backend/serializer.cpp
@@ -1,18 +1,18 @@
 #include "serializer.h"
-#include "nnc/core/linalg/ShapeRange.h"
-#include "nnc/core/linalg/TensorUtil.h"
-
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
+#include "core/modelIR/ShapeRange.h"
+#include "core/modelIR/TensorUtil.h"
+
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/softmax_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/fully_connected_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/reshape_op.h"
+#include "core/modelIR/ir_node.h"
 
 #include <algorithm>
 
diff --git a/contrib/nnc/plugin/soft_backend/serializer.h b/contrib/nnc/plugin/soft_backend/serializer.h
index 8384787..3b498d0 100644
--- a/contrib/nnc/plugin/soft_backend/serializer.h
+++ b/contrib/nnc/plugin/soft_backend/serializer.h
@@ -1,9 +1,9 @@
 #ifndef _NNC_SOFT_BACKEND_SERIALIZER_H_
 #define _NNC_SOFT_BACKEND_SERIALIZER_H_
 
-#include "nnc/core/IR/model/visitor/visitor.h"
-#include "nnc/core/linalg/Shape.h"
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/visitor.h"
+#include "core/modelIR/Shape.h"
+#include "core/modelIR/TensorVariant.h"
 #include "model_analyzer.h"
 
 #include <vector>
diff --git a/contrib/nnc/plugin/soft_backend/soft_backend.cpp b/contrib/nnc/plugin/soft_backend/soft_backend.cpp
index 22b4303..61e9288 100644
--- a/contrib/nnc/plugin/soft_backend/soft_backend.cpp
+++ b/contrib/nnc/plugin/soft_backend/soft_backend.cpp
@@ -5,7 +5,7 @@
 
 #include "soft_backend.h"
 #include "support/PluginException.h"
-#include "nnc/core/IR/model/graph/graph.h"
+#include "core/modelIR/graph.h"
 
 #include "support/Debug.h"
 #define DEBUG_AREA "soft_backend"
diff --git a/contrib/nnc/plugin/soft_backend/soft_backend.h b/contrib/nnc/plugin/soft_backend/soft_backend.h
index 4e93be0..08a31ea 100644
--- a/contrib/nnc/plugin/soft_backend/soft_backend.h
+++ b/contrib/nnc/plugin/soft_backend/soft_backend.h
@@ -2,7 +2,7 @@
 #define _NNC_SOFT_BACKEND_PLUGIN_H_
 
 #include "support/PluginInstance.h"
-#include "nnc/core/IR/model/graph/graph.h"
+#include "core/modelIR/graph.h"
 #include "base_generator.h"
 
 #include <string>
diff --git a/contrib/nnc/tests/interpreter/graph_creator.cpp b/contrib/nnc/tests/interpreter/graph_creator.cpp
index 9d81ca3..d2fed1d 100644
--- a/contrib/nnc/tests/interpreter/graph_creator.cpp
+++ b/contrib/nnc/tests/interpreter/graph_creator.cpp
@@ -1,19 +1,19 @@
 #include <memory>
 #include <cassert>
 
-#include "nnc/core/IR/model/operations/variable_op.h"
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-
-#include "nnc/core/IR/model/actions/ShapeInference.h"
+#include "core/modelIR/operations/variable_op.h"
+#include "core/modelIR/operations/fully_connected_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/reshape_op.h"
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
+#include "core/modelIR/operations/softmax_op.h"
+
+#include "core/modelIR/ShapeInference.h"
 #include "shape_helper.h"
 
 #include "op_info_generated.h"
diff --git a/contrib/nnc/tests/interpreter/graph_creator.h b/contrib/nnc/tests/interpreter/graph_creator.h
index ad7ef24..8a1a10b 100644
--- a/contrib/nnc/tests/interpreter/graph_creator.h
+++ b/contrib/nnc/tests/interpreter/graph_creator.h
@@ -1,7 +1,7 @@
 #ifndef NNC_INTERPRETER_OP_TEST_GRAPH_CREATOR_H
 #define NNC_INTERPRETER_OP_TEST_GRAPH_CREATOR_H
 
-#include "nnc/core/IR/model/graph/graph.h"
+#include "core/modelIR/graph.h"
 
 std::unique_ptr<nncc::contrib::core::IR::model::Graph> make_graph(const opinfo::OperatorInfo* opInfo);
 
diff --git a/contrib/nnc/tests/interpreter/op_info_util.cpp b/contrib/nnc/tests/interpreter/op_info_util.cpp
index 2a8756d..f37857f 100644
--- a/contrib/nnc/tests/interpreter/op_info_util.cpp
+++ b/contrib/nnc/tests/interpreter/op_info_util.cpp
@@ -3,9 +3,9 @@
 
 #include "gtest/gtest.h"
 
-#include "nnc/core/linalg/Tensor.h"
-#include "nnc/core/linalg/ShapeRange.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/Tensor.h"
+#include "core/modelIR/ShapeRange.h"
+#include "core/modelIR/Shape.h"
 #include "op_info_util.h"
 
 std::shared_ptr<TensorVariant> getTensor(const opinfo::Tensor* t)
diff --git a/contrib/nnc/tests/interpreter/op_info_util.h b/contrib/nnc/tests/interpreter/op_info_util.h
index 3bccf9e..6abb2fa 100644
--- a/contrib/nnc/tests/interpreter/op_info_util.h
+++ b/contrib/nnc/tests/interpreter/op_info_util.h
@@ -4,11 +4,11 @@
 #include <memory>
 #include <cassert>
 
-#include "nnc/core/linalg/TensorVariant.h"
-#include "nnc/core/IR/model/operations/common.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
+#include "core/modelIR/TensorVariant.h"
+#include "core/modelIR/operations/common.h"
+#include "core/modelIR/operations/pool_op.h"
 
-#include "nnc/core/IR/model/actions/ShapeInference.h"
+#include "core/modelIR/ShapeInference.h"
 
 #include "op_info_generated.h"
 #include "shape_helper.h"
diff --git a/contrib/nnc/tests/interpreter/op_test.cpp b/contrib/nnc/tests/interpreter/op_test.cpp
index 3fdff4a..51f25ac 100644
--- a/contrib/nnc/tests/interpreter/op_test.cpp
+++ b/contrib/nnc/tests/interpreter/op_test.cpp
@@ -6,7 +6,7 @@
 #include "op_info_generated.h"
 
 #include "plugin/interpreter/Interpreter.h"
-#include "nnc/core/IR/model/graph/graph.h"
+#include "core/modelIR/graph.h"
 #include "op_info_util.h"
 #include "graph_creator.h"
 
diff --git a/contrib/nnc/unittests/core/ShapeInference.cpp b/contrib/nnc/unittests/core/ShapeInference.cpp
index 2b118b1..3e80cb6 100644
--- a/contrib/nnc/unittests/core/ShapeInference.cpp
+++ b/contrib/nnc/unittests/core/ShapeInference.cpp
@@ -1,7 +1,7 @@
-#include "nnc/core/IR/model/graph/graph.h"
-#include "nnc/core/IR/model/actions/ShapeInference.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
-#include "nnc/core/linalg/Shape.h"
+#include "core/modelIR/graph.h"
+#include "core/modelIR/ShapeInference.h"
+#include "core/modelIR/operations/reshape_op.h"
+#include "core/modelIR/Shape.h"
 
 #include "gtest/gtest.h"
 
diff --git a/contrib/nnc/unittests/core/ShapeRange.cpp b/contrib/nnc/unittests/core/ShapeRange.cpp
index 99bce76..849c15d 100644
--- a/contrib/nnc/unittests/core/ShapeRange.cpp
+++ b/contrib/nnc/unittests/core/ShapeRange.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "nnc/core/linalg/ShapeRange.h"
+#include "core/modelIR/ShapeRange.h"
 
 namespace {
 
diff --git a/contrib/nnc/unittests/core/TensorVariant.cpp b/contrib/nnc/unittests/core/TensorVariant.cpp
index 1d94a9f..c99ac7d 100644
--- a/contrib/nnc/unittests/core/TensorVariant.cpp
+++ b/contrib/nnc/unittests/core/TensorVariant.cpp
@@ -1,4 +1,4 @@
-#include "nnc/core/linalg/TensorVariant.h"
+#include "core/modelIR/TensorVariant.h"
 
 #include <gtest/gtest.h>
 
diff --git a/contrib/nnc/unittests/core/ir_node.cpp b/contrib/nnc/unittests/core/ir_node.cpp
index a4dbc8f..d4b8a5a 100644
--- a/contrib/nnc/unittests/core/ir_node.cpp
+++ b/contrib/nnc/unittests/core/ir_node.cpp
@@ -1,6 +1,6 @@
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
-#include "nnc/core/IR/model/graph/ir_node.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/operations/reshape_op.h"
+#include "core/modelIR/ir_node.h"
 
 #include <gtest/gtest.h>
 
diff --git a/contrib/nnc/unittests/core/operation.cpp b/contrib/nnc/unittests/core/operation.cpp
index a40e859..0f27981 100644
--- a/contrib/nnc/unittests/core/operation.cpp
+++ b/contrib/nnc/unittests/core/operation.cpp
@@ -1,6 +1,6 @@
-#include "nnc/core/IR/model/operations/operation.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
-#include "nnc/core/IR/model/operations/concat_op.h"
+#include "core/modelIR/operations/operation.h"
+#include "core/modelIR/operations/softmax_op.h"
+#include "core/modelIR/operations/concat_op.h"
 
 #include <gtest/gtest.h>
 
diff --git a/contrib/nnc/unittests/soft_backend/cpp_operations.cpp b/contrib/nnc/unittests/soft_backend/cpp_operations.cpp
index 2838e6e..50baf69 100644
--- a/contrib/nnc/unittests/soft_backend/cpp_operations.cpp
+++ b/contrib/nnc/unittests/soft_backend/cpp_operations.cpp
@@ -28,25 +28,25 @@
 #include "serializer.h"
 
 // operations part
-#include "nnc/core/IR/model/operations/variable_op.h"
-#include "nnc/core/IR/model/operations/fully_connected_op.h"
-#include "nnc/core/IR/model/operations/conv_2d_op.h"
-#include "nnc/core/IR/model/operations/depthwise_conv2d_op.h"
-#include "nnc/core/IR/model/operations/pool_op.h"
-#include "nnc/core/IR/model/operations/relu_op.h"
-#include "nnc/core/IR/model/operations/capped_relu_op.h"
-#include "nnc/core/IR/model/operations/reshape_op.h"
-#include "nnc/core/IR/model/operations/concat_op.h"
-#include "nnc/core/IR/model/operations/bias_add_op.h"
-#include "nnc/core/IR/model/operations/softmax_op.h"
+#include "core/modelIR/operations/variable_op.h"
+#include "core/modelIR/operations/fully_connected_op.h"
+#include "core/modelIR/operations/conv_2d_op.h"
+#include "core/modelIR/operations/depthwise_conv2d_op.h"
+#include "core/modelIR/operations/pool_op.h"
+#include "core/modelIR/operations/relu_op.h"
+#include "core/modelIR/operations/capped_relu_op.h"
+#include "core/modelIR/operations/reshape_op.h"
+#include "core/modelIR/operations/concat_op.h"
+#include "core/modelIR/operations/bias_add_op.h"
+#include "core/modelIR/operations/softmax_op.h"
 
 // various headers
-#include "nnc/core/linalg/TensorVariant.h"
-#include "nnc/core/linalg/Tensor.h"
-#include "nnc/core/IR/model/graph/graph.h"
-#include "nnc/core/linalg/ShapeRange.h"
+#include "core/modelIR/TensorVariant.h"
+#include "core/modelIR/Tensor.h"
+#include "core/modelIR/graph.h"
+#include "core/modelIR/ShapeRange.h"
 
-#include "nnc/core/IR/model/actions/ShapeInference.h"
+#include "core/modelIR/ShapeInference.h"
 #include "plugin/interpreter/Interpreter.h"
 
 #include "gtest/gtest.h"