diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cea83d9728a4ac26c1a6d6b1970fd5e3303ff9f..223fbb39bd2c140303f1549d07a0c06b2f72fb95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,52 +1,144 @@
+cmake_minimum_required(VERSION 3.11)
 
-if (BUILD_CORE_ALONE)
-    project(Aidge_Core)
-    cmake_minimum_required(VERSION 3.11)
-    add_compile_options(-Wall -Wextra -fPIC)
-endif()
-
-if (PYBIND)
-    add_definitions(-DPYBIND)
-    Include(FetchContent)
+set(project aidge)
+set(version 2.0.0)
+project(${project})
+enable_testing()
+# TODO : use a file to store module_name ?
+set(module_name aidge_core) # This will be python module name 
+set(component core) # Traget name must be different than pybind target
 
-    FetchContent_Declare(
-    PyBind11
-    GIT_REPOSITORY https://github.com/pybind/pybind11.git
-    GIT_TAG        v2.10.4 # or a later release
-    )
+##############################################
+# Import utils CMakeLists
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+include(PybindModuleCreation)
 
-    FetchContent_MakeAvailable(PyBind11)
-    file(GLOB_RECURSE pybind_src_files "python_binding/*.cpp")
-    pybind11_add_module(aidge_core MODULE ${pybind_src_files} "NO_EXTRAS")
-    target_include_directories(aidge_core PUBLIC ${pybind11_INCLUDE_DIRS} "python_binding")
-    target_link_libraries(aidge_core PUBLIC core)
-    # generate_python_binding(aidge_core core)
-endif()
+##############################################
+# Define options
+option(PYBIND "python binding" ON)
+option(WERROR "Warning as error" OFF)
 
-add_library(core STATIC)
+##############################################
+# Find system dependencies
+generate_python_binding(aidge_${module_name}) # TODO : cannot be component because of target name
 
-# Add include directories 
-target_include_directories(core PUBLIC "include")
+##############################################
+# Create target and set properties
 
-# Containers module
 file(GLOB_RECURSE src_files "src/*.cpp")
-target_sources(core PRIVATE ${src_files})
+file(GLOB_RECURSE inc_files "include/*.hpp")
+
+add_library(${component} ${src_files} ${inc_files})
 
-set_property(TARGET core PROPERTY POSITION_INDEPENDENT_CODE ON)
+# namespaced alias
+add_library(${project}::${component} ALIAS ${component})
 
+#Set target properties
+set_property(TARGET ${component} PROPERTY POSITION_INDEPENDENT_CODE ON)
+target_include_directories(${component}
+    PUBLIC
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
 if (PYBIND)
-    target_include_directories(core PUBLIC $<BUILD_INTERFACE:${PYTHON_INCLUDE_DIRS}>)
-    target_link_libraries(core PRIVATE ${PYTHON_LIBRARIES})
-endif()
+    message(STATUS "PYTHON INCLUDE DIR : ${PYTHON_INCLUDE_DIRS}")
+    message(STATUS "PYTHON PYTHON_LIBRARY : ${PYTHON_LIBRARIES}")
 
-if (NOT BUILD_CORE_ALONE)
-    # Activate compile time reducer for aidge_core
-    set_target_properties(core PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-    # set_target_properties(n2d2_cpu_lib PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "include/utils/Precompiled.hpp")
-    cotire(core)
+    target_include_directories(${component}
+        PUBLIC
+            $<BUILD_INTERFACE:${PYTHON_INCLUDE_DIRS}>
+    )
+    target_link_libraries(${component}
+        PRIVATE
+            ${PYTHON_LIBRARIES}
+    )
 endif()
+target_compile_features(${component} PRIVATE cxx_std_14)
+
+if(WERROR)
+target_compile_options(${component} PRIVATE
+$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+-Wall -Wextra -Wold-style-cast -Winline -pedantic -Werror=narrowing -Wshadow -Werror>)
+target_compile_options(${component} PRIVATE
+$<$<CXX_COMPILER_ID:MSVC>:
+/W4>)
+else()
+    target_compile_options(${component} PRIVATE
+        $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+        -Wall -Wextra -Wold-style-cast -Winline -pedantic -Werror=narrowing -Wshadow -Wpedantic>)
+        target_compile_options(${component} PRIVATE
+        $<$<CXX_COMPILER_ID:MSVC>:
+        /W4>)
+        endif()
+
+##############################################
+# Installation instructions
+
+include(GNUInstallDirs)
+set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${project})
+
+install(TARGETS ${component} EXPORT ${component}-targets
+  COMPONENT ${component}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+#Export the targets to a script
+install(EXPORT ${component}-targets
+  FILE "${project}-${component}-targets.cmake"
+  NAMESPACE ${project}::
+  DESTINATION ${INSTALL_CONFIGDIR}
+  COMPONENT ${component}
+)
+
+#Create a ConfigVersion.cmake file
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+    "${CMAKE_CURRENT_BINARY_DIR}/${project}-${component}-config-version.cmake"
+    VERSION ${version}
+    COMPATIBILITY AnyNewerVersion
+)
+
+configure_package_config_file("${component}-config.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/${project}-${component}-config.cmake"
+    INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
+)
+
+#Install the config, configversion and custom find modules
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/${project}-${component}-config.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/${project}-${component}-config-version.cmake"
+    DESTINATION ${INSTALL_CONFIGDIR}
+    COMPONENT ${component}
+)
+
+##############################################
+## Exporting from the build tree
+export(EXPORT ${component}-targets
+    FILE "${CMAKE_CURRENT_BINARY_DIR}/${project}-${component}-targets.cmake"
+    NAMESPACE ${project}::)
+
+
+##############################################
+## Add test
+add_subdirectory(unit_tests)
+
+include(CMakePackageConfigHelpers)
+
+write_basic_package_version_file(
+  "${CMAKE_BINARY_DIR}/${project}-config-version.cmake"
+  VERSION ${version}
+  COMPATIBILITY AnyNewerVersion
+)
 
 
-if (TESTS)
-    add_subdirectory(tests)
-endif()
\ No newline at end of file
+# install(
+#   FILES
+#     "${CMAKE_BINARY_DIR}/${project}-config.cmake"
+#   DESTINATION lib/cmake/${project}
+# )
diff --git a/OLD_CMakeLists.txt b/OLD_CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7cea83d9728a4ac26c1a6d6b1970fd5e3303ff9f
--- /dev/null
+++ b/OLD_CMakeLists.txt
@@ -0,0 +1,52 @@
+
+if (BUILD_CORE_ALONE)
+    project(Aidge_Core)
+    cmake_minimum_required(VERSION 3.11)
+    add_compile_options(-Wall -Wextra -fPIC)
+endif()
+
+if (PYBIND)
+    add_definitions(-DPYBIND)
+    Include(FetchContent)
+
+    FetchContent_Declare(
+    PyBind11
+    GIT_REPOSITORY https://github.com/pybind/pybind11.git
+    GIT_TAG        v2.10.4 # or a later release
+    )
+
+    FetchContent_MakeAvailable(PyBind11)
+    file(GLOB_RECURSE pybind_src_files "python_binding/*.cpp")
+    pybind11_add_module(aidge_core MODULE ${pybind_src_files} "NO_EXTRAS")
+    target_include_directories(aidge_core PUBLIC ${pybind11_INCLUDE_DIRS} "python_binding")
+    target_link_libraries(aidge_core PUBLIC core)
+    # generate_python_binding(aidge_core core)
+endif()
+
+add_library(core STATIC)
+
+# Add include directories 
+target_include_directories(core PUBLIC "include")
+
+# Containers module
+file(GLOB_RECURSE src_files "src/*.cpp")
+target_sources(core PRIVATE ${src_files})
+
+set_property(TARGET core PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+if (PYBIND)
+    target_include_directories(core PUBLIC $<BUILD_INTERFACE:${PYTHON_INCLUDE_DIRS}>)
+    target_link_libraries(core PRIVATE ${PYTHON_LIBRARIES})
+endif()
+
+if (NOT BUILD_CORE_ALONE)
+    # Activate compile time reducer for aidge_core
+    set_target_properties(core PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
+    # set_target_properties(n2d2_cpu_lib PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "include/utils/Precompiled.hpp")
+    cotire(core)
+endif()
+
+
+if (TESTS)
+    add_subdirectory(tests)
+endif()
\ No newline at end of file
diff --git a/cmake/PybindModuleCreation.cmake b/cmake/PybindModuleCreation.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..6ca1aeffec5f07a3b50567f2033af94a714b32f4
--- /dev/null
+++ b/cmake/PybindModuleCreation.cmake
@@ -0,0 +1,19 @@
+function(generate_python_binding name) 
+    if (PYBIND)
+        add_definitions(-DPYBIND)
+        Include(FetchContent)
+
+        FetchContent_Declare(
+        PyBind11
+        GIT_REPOSITORY https://github.com/pybind/pybind11.git
+        GIT_TAG        v2.10.4 # or a later release
+        )
+
+        FetchContent_MakeAvailable(PyBind11)
+        message(STATUS "Creating binding for module ${name}")
+        file(GLOB_RECURSE pybind_src_files "python_binding/*.cpp")
+        pybind11_add_module(${name} MODULE ${pybind_src_files})
+        target_include_directories(${name} PUBLIC ${pybind11_INCLUDE_DIRS} "python_binding")
+        target_link_libraries(${name} PUBLIC ${component})
+    endif()
+endfunction()
diff --git a/core-config.cmake.in b/core-config.cmake.in
new file mode 100644
index 0000000000000000000000000000000000000000..6cf0fac1ea397a33a8c9d8c8d1be8ea2163a2116
--- /dev/null
+++ b/core-config.cmake.in
@@ -0,0 +1,3 @@
+include(${CMAKE_CURRENT_LIST_DIR}/aidge_core-config-version.cmake)
+
+include(${CMAKE_CURRENT_LIST_DIR}/aidge_core-targets.cmake)
diff --git a/include/backend/OperatorImpl.hpp b/include/aidge/backend/OperatorImpl.hpp
similarity index 98%
rename from include/backend/OperatorImpl.hpp
rename to include/aidge/backend/OperatorImpl.hpp
index 4cf6eef6017a59e383d9f00d44ea321820e4c06d..a8b4b0938dd674eec4ac67a0b5c5b05789134b27 100644
--- a/include/backend/OperatorImpl.hpp
+++ b/include/aidge/backend/OperatorImpl.hpp
@@ -14,7 +14,7 @@
 
 #include <cstddef>
 #include <vector>
-#include "utils/Types.h"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 class OperatorImpl {
diff --git a/include/backend/TensorImpl.hpp b/include/aidge/backend/TensorImpl.hpp
similarity index 97%
rename from include/backend/TensorImpl.hpp
rename to include/aidge/backend/TensorImpl.hpp
index f4c38d59b0a304ba26f693b1a1425ef9fbeb2af0..58f2d547e513d540a491155045c463f9a7199578 100644
--- a/include/backend/TensorImpl.hpp
+++ b/include/aidge/backend/TensorImpl.hpp
@@ -14,7 +14,7 @@
 
 #include <cstddef>
 #include <cstdio>
-#include "utils/Types.h"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 class TensorImpl {
diff --git a/include/data/Data.hpp b/include/aidge/data/Data.hpp
similarity index 98%
rename from include/data/Data.hpp
rename to include/aidge/data/Data.hpp
index ddf3c3f1bea1286e52cb531c5ea010520e409271..4edc4b9a5a9fd877cf9a3e84c7f644be2a11534a 100644
--- a/include/data/Data.hpp
+++ b/include/aidge/data/Data.hpp
@@ -12,7 +12,7 @@
 #ifndef __AIDGE_DATA_H__
 #define __AIDGE_DATA_H__
 
-#include "utils/Parameter.hpp"
+#include "aidge/utils/Parameter.hpp"
 
 namespace Aidge {
 enum class DataType {
diff --git a/include/data/Tensor.hpp b/include/aidge/data/Tensor.hpp
similarity index 99%
rename from include/data/Tensor.hpp
rename to include/aidge/data/Tensor.hpp
index 30aa1446256c50f56726d78491b60042da026050..bd2c7317fd0d8cca7f330cee013ff6b8de7b3e85 100644
--- a/include/data/Tensor.hpp
+++ b/include/aidge/data/Tensor.hpp
@@ -19,10 +19,10 @@
 #include <string>
 #include <vector>
 
-#include "backend/TensorImpl.hpp"
-#include "data/Data.hpp"
-#include "utils/Registrar.hpp"
-#include "utils/Types.h"
+#include "aidge/backend/TensorImpl.hpp"
+#include "aidge/data/Data.hpp"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 
diff --git a/include/graph/Connector.hpp b/include/aidge/graph/Connector.hpp
similarity index 98%
rename from include/graph/Connector.hpp
rename to include/aidge/graph/Connector.hpp
index 5ab5651daf84ac4c7af5f3a8b9c1abc0ca2ad001..796602a3018841261aa91ff9d1da231b6d95ccff 100644
--- a/include/graph/Connector.hpp
+++ b/include/aidge/graph/Connector.hpp
@@ -15,7 +15,7 @@
 #include <memory>
 #include <vector>
 
-#include "utils/Types.h"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
     
diff --git a/include/graph/GraphView.hpp b/include/aidge/graph/GraphView.hpp
similarity index 99%
rename from include/graph/GraphView.hpp
rename to include/aidge/graph/GraphView.hpp
index b258f78dbfb9f026588da7e16d385874ea8110ba..254a1dd92bdf12b8aa0762297578a55048b056fc 100644
--- a/include/graph/GraphView.hpp
+++ b/include/aidge/graph/GraphView.hpp
@@ -1,3 +1,4 @@
+
 /********************************************************************************
  * Copyright (c) 2023 CEA-List
  *
@@ -19,8 +20,8 @@
 #include <utility>
 #include <vector>
 
-#include "graph/Node.hpp"
-#include "utils/Types.h"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 enum class DataType;
diff --git a/include/graph/Node.hpp b/include/aidge/graph/Node.hpp
similarity index 99%
rename from include/graph/Node.hpp
rename to include/aidge/graph/Node.hpp
index 94a63becb76b7147e5273c2a35591fc00ebe74ce..977b0e4721bad9e83a9f3e04e5228bd25cf186da 100644
--- a/include/graph/Node.hpp
+++ b/include/aidge/graph/Node.hpp
@@ -19,9 +19,9 @@
 #include <vector>
 #include <utility>
 
-#include "graph/Connector.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Types.h"
+#include "aidge/graph/Connector.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 
diff --git a/include/graph/OpArgs.hpp b/include/aidge/graph/OpArgs.hpp
similarity index 100%
rename from include/graph/OpArgs.hpp
rename to include/aidge/graph/OpArgs.hpp
diff --git a/include/graphmatching/GRegex.hpp b/include/aidge/graphmatching/GRegex.hpp
similarity index 89%
rename from include/graphmatching/GRegex.hpp
rename to include/aidge/graphmatching/GRegex.hpp
index 5a49bcd8f8083cb10eba5d0d02c360b3df20c65b..1292b607cee35f50dc0acc5f5113946be103065e 100644
--- a/include/graphmatching/GRegex.hpp
+++ b/include/aidge/graphmatching/GRegex.hpp
@@ -18,11 +18,11 @@
 #include <memory>       // for shared_ptr
 #include <algorithm>    // for next_permutation
 
-#include "graphmatching/Utile.hpp"
-#include "graphmatching/StmFactory.hpp"
-#include "graphmatching/SeqStm.hpp"
-#include "graphmatching/NodeRegex.hpp"
-#include "graphmatching/Match.hpp"
+#include "aidge/graphmatching/Utile.hpp"
+#include "aidge/graphmatching/StmFactory.hpp"
+#include "aidge/graphmatching/SeqStm.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
+#include "aidge/graphmatching/Match.hpp"
 
 
 namespace Aidge{
diff --git a/include/graphmatching/Match.hpp b/include/aidge/graphmatching/Match.hpp
similarity index 95%
rename from include/graphmatching/Match.hpp
rename to include/aidge/graphmatching/Match.hpp
index 2651bf3ae4f96a2a182ed0b9335ee0ad7f35a4f3..27acc2e8a0880f8c62d0ba995fcde5479bdcb501 100644
--- a/include/graphmatching/Match.hpp
+++ b/include/aidge/graphmatching/Match.hpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <iostream>
 #include <cassert>
-#include "graphmatching/Utile.hpp"
+#include "aidge/graphmatching/Utile.hpp"
 
 
 namespace Aidge{
diff --git a/include/graphmatching/NodeRegex.hpp b/include/aidge/graphmatching/NodeRegex.hpp
similarity index 96%
rename from include/graphmatching/NodeRegex.hpp
rename to include/aidge/graphmatching/NodeRegex.hpp
index 24a8ed225b504ed2240dced7302d9d38f5c07493..387bfea46f0147613a116beac1f9c6102ed661e5 100644
--- a/include/graphmatching/NodeRegex.hpp
+++ b/include/aidge/graphmatching/NodeRegex.hpp
@@ -14,7 +14,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <cstring>
-#include "graph/Node.hpp"
+#include "aidge/graph/Node.hpp"
 
 
 namespace Aidge {
diff --git a/include/graphmatching/SeqStm.hpp b/include/aidge/graphmatching/SeqStm.hpp
similarity index 94%
rename from include/graphmatching/SeqStm.hpp
rename to include/aidge/graphmatching/SeqStm.hpp
index 0abcc3d0d9a247debf118e30b2490cafcdfe96cc..6ccd6cfcd322c4d38af2ad04cd2b3a96d839e6cd 100755
--- a/include/graphmatching/SeqStm.hpp
+++ b/include/aidge/graphmatching/SeqStm.hpp
@@ -22,8 +22,8 @@
 #include <vector>
 
 
-#include "graphmatching/NodeRegex.hpp"
-#include "graphmatching/Utile.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
+#include "aidge/graphmatching/Utile.hpp"
 
 
 namespace Aidge {
diff --git a/include/graphmatching/StmFactory.hpp b/include/aidge/graphmatching/StmFactory.hpp
similarity index 90%
rename from include/graphmatching/StmFactory.hpp
rename to include/aidge/graphmatching/StmFactory.hpp
index 2e5e84511d023087b26d167ba4ab632654400954..929fdaf3595038f21367768254040c45b291641b 100644
--- a/include/graphmatching/StmFactory.hpp
+++ b/include/aidge/graphmatching/StmFactory.hpp
@@ -21,9 +21,9 @@
 #include <stdexcept>   // for exception, runtime_error, out_of_range
 #include <regex>
 
-#include "graphmatching/NodeRegex.hpp"
-#include "graphmatching/SeqStm.hpp"
-#include "graphmatching/Utile.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
+#include "aidge/graphmatching/SeqStm.hpp"
+#include "aidge/graphmatching/Utile.hpp"
 
 namespace Aidge{
 
diff --git a/include/graphmatching/Utile.hpp b/include/aidge/graphmatching/Utile.hpp
similarity index 96%
rename from include/graphmatching/Utile.hpp
rename to include/aidge/graphmatching/Utile.hpp
index 251eafd836e81d2ee0f20ea46bcea0de3df70a4f..acda78cd181519c86ab0b14d5b01bf91223cec9d 100644
--- a/include/graphmatching/Utile.hpp
+++ b/include/aidge/graphmatching/Utile.hpp
@@ -14,7 +14,7 @@
 
 #include <map>
 
-#include "graph/Node.hpp"
+#include "aidge/graph/Node.hpp"
 #include <map>
 
 namespace Aidge {
diff --git a/include/operator/Add.hpp b/include/aidge/operator/Add.hpp
similarity index 96%
rename from include/operator/Add.hpp
rename to include/aidge/operator/Add.hpp
index fc2dc8a47a0a0bb834e3374eccfeeced631b436d..13ebcd48cb93c98944b20522b2314d928b7d22fe 100644
--- a/include/operator/Add.hpp
+++ b/include/aidge/operator/Add.hpp
@@ -18,11 +18,11 @@
 #include <memory>
 #include <array>
 
-#include "utils/Registrar.hpp"
-#include "operator/Operator.hpp"
-#include "data/Tensor.hpp"
-#include "graph/Node.hpp"
-#include "utils/Types.h"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 
diff --git a/include/operator/AvgPooling.hpp b/include/aidge/operator/AvgPooling.hpp
similarity index 96%
rename from include/operator/AvgPooling.hpp
rename to include/aidge/operator/AvgPooling.hpp
index 35a401fef4d408aa0f30c5e5af23a5171f8c2193..e79640842e374d97c2cb982b2081f2fbdcbd0645 100644
--- a/include/operator/AvgPooling.hpp
+++ b/include/aidge/operator/AvgPooling.hpp
@@ -17,13 +17,13 @@
 #include <vector>
 #include <cmath>
 
-#include "data/Tensor.hpp"
-#include "graph/Node.hpp"
-#include "operator/Operator.hpp"
-#include "operator/Producer.hpp"
-#include "utils/Parameter.hpp"
-#include "utils/Registrar.hpp"
-#include "utils/Types.h"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 enum class AvgPoolingParam { StrideDims, KernelDims, PaddingDims };
diff --git a/include/operator/BatchNorm.hpp b/include/aidge/operator/BatchNorm.hpp
similarity index 96%
rename from include/operator/BatchNorm.hpp
rename to include/aidge/operator/BatchNorm.hpp
index 9499cff111d2497f72309329c7d050c3acc9419b..2c11fa2d2abba606d1bfbcb17ff0436dba012385 100644
--- a/include/operator/BatchNorm.hpp
+++ b/include/aidge/operator/BatchNorm.hpp
@@ -16,13 +16,13 @@
 #include <memory>
 #include <vector>
 
-#include "utils/Types.h"
-#include "data/Tensor.hpp"
-#include "graph/Node.hpp"
-#include "operator/Operator.hpp"
-#include "operator/Producer.hpp"
-#include "utils/Parameter.hpp"
-#include "utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Registrar.hpp"
 
 namespace Aidge {
 enum class BatchNormParam { Epsilon, Momentum };
diff --git a/include/operator/Conv.hpp b/include/aidge/operator/Conv.hpp
similarity index 97%
rename from include/operator/Conv.hpp
rename to include/aidge/operator/Conv.hpp
index 1de05af0b60653b06394b6e39dcf92570dee5380..2620d6261b26663afd0dd527547eaab1df1d521d 100644
--- a/include/operator/Conv.hpp
+++ b/include/aidge/operator/Conv.hpp
@@ -17,13 +17,13 @@
 #include <numeric>
 #include <vector>
 
-#include "data/Tensor.hpp"
-#include "graph/Node.hpp"
-#include "operator/Operator.hpp"
-#include "operator/Producer.hpp"
-#include "utils/Parameter.hpp"
-#include "utils/Registrar.hpp"
-#include "utils/Types.h"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 enum class ConvParam { StrideDims, DilationDims, InChannels, OutChannels, KernelDims, PaddingDims };
diff --git a/include/operator/ConvDepthWise.hpp b/include/aidge/operator/ConvDepthWise.hpp
similarity index 97%
rename from include/operator/ConvDepthWise.hpp
rename to include/aidge/operator/ConvDepthWise.hpp
index c9a0e6b0171be79371e74f6a8f6ebebb2b901364..ad9e1951237d7c7a20419a12abc3ba668b397c19 100644
--- a/include/operator/ConvDepthWise.hpp
+++ b/include/aidge/operator/ConvDepthWise.hpp
@@ -17,13 +17,13 @@
 #include <numeric>
 #include <vector>
 
-#include "data/Tensor.hpp"
-#include "graph/Node.hpp"
-#include "operator/Operator.hpp"
-#include "operator/Producer.hpp"
-#include "utils/Parameter.hpp"
-#include "utils/Registrar.hpp"
-#include "utils/Types.h"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 enum class ConvDepthWiseParam { StrideDims, DilationDims, Channels, KernelDims, PaddingDims };
diff --git a/include/operator/FC.hpp b/include/aidge/operator/FC.hpp
similarity index 95%
rename from include/operator/FC.hpp
rename to include/aidge/operator/FC.hpp
index 240210f40392d7ac8aaf5bc4426e5c8b2b254ba5..9b36640af717547baf0f20d06a700129c07f8f47 100644
--- a/include/operator/FC.hpp
+++ b/include/aidge/operator/FC.hpp
@@ -18,13 +18,13 @@
 #include <memory>
 #include <vector>
 
-#include "utils/Types.h"
-#include "data/Tensor.hpp"
-#include "graph/Node.hpp"
-#include "operator/Operator.hpp"
-#include "operator/Producer.hpp"
-#include "utils/Parameter.hpp"
-#include "utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Registrar.hpp"
 
 namespace Aidge {
 enum class FCParam { OutChannels, NoBias };
diff --git a/include/operator/GenericOperator.hpp b/include/aidge/operator/GenericOperator.hpp
similarity index 97%
rename from include/operator/GenericOperator.hpp
rename to include/aidge/operator/GenericOperator.hpp
index e25fbd13f9139c8b857690ba6adc512f558f50c4..b8b86521a2fa925cfc04adf0a313e518473d9cab 100644
--- a/include/operator/GenericOperator.hpp
+++ b/include/aidge/operator/GenericOperator.hpp
@@ -17,11 +17,11 @@
 #include <string>
 #include <cassert>
 
-#include "graph/Node.hpp"
-#include "operator/Operator.hpp"
-#include "utils/CParameter.hpp"
-#include "utils/Registrar.hpp"
-#include "utils/Types.h"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/CParameter.hpp"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 class GenericOperator_Op
diff --git a/include/operator/LeakyReLU.hpp b/include/aidge/operator/LeakyReLU.hpp
similarity index 93%
rename from include/operator/LeakyReLU.hpp
rename to include/aidge/operator/LeakyReLU.hpp
index 35a28e8356324312b2fbc14360116bc7d37baead..4793d9ca69dcb2b11fe4b83b4871c5b6becff358 100644
--- a/include/operator/LeakyReLU.hpp
+++ b/include/aidge/operator/LeakyReLU.hpp
@@ -15,14 +15,14 @@
 #include <vector>
 #include <memory>
 
-#include "utils/Parameter.hpp"
-#include "utils/Registrar.hpp"
-#include "operator/Operator.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "data/Tensor.hpp"
-#include "data/Data.hpp"
-#include "graph/Node.hpp"
-#include "utils/Types.h"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/data/Data.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 enum class LeakyReLUParam {
diff --git a/include/operator/Matmul.hpp b/include/aidge/operator/Matmul.hpp
similarity index 95%
rename from include/operator/Matmul.hpp
rename to include/aidge/operator/Matmul.hpp
index 9ecebf9d6b043a5eda011da932b58cb3e751d105..1d8174775a13074b3d39751267828ea3b473f59e 100644
--- a/include/operator/Matmul.hpp
+++ b/include/aidge/operator/Matmul.hpp
@@ -18,13 +18,13 @@
 #include <memory>
 #include <vector>
 
-#include "utils/Types.h"
-#include "data/Tensor.hpp"
-#include "graph/Node.hpp"
-#include "operator/Operator.hpp"
-#include "operator/Producer.hpp"
-#include "utils/Parameter.hpp"
-#include "utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Registrar.hpp"
 
 namespace Aidge {
 enum class MatmulParam { OutChannels };
diff --git a/include/operator/MetaOperator.hpp b/include/aidge/operator/MetaOperator.hpp
similarity index 94%
rename from include/operator/MetaOperator.hpp
rename to include/aidge/operator/MetaOperator.hpp
index 5d4bad51ca9e8198194f884ec839f6b5d270036a..7fa1a20449d055da9cd25e6dc4f987757aca3f4a 100644
--- a/include/operator/MetaOperator.hpp
+++ b/include/aidge/operator/MetaOperator.hpp
@@ -12,7 +12,7 @@
 #ifndef __AIDGE_CORE_OPERATOR_METAOPERATOR_H__
 #define __AIDGE_CORE_OPERATOR_METAOPERATOR_H__
 
-#include "operator/Operator.hpp"
+#include "aidge/operator/Operator.hpp"
 
 namespace Aidge {
 class MetaOperator : public Operator {
diff --git a/include/operator/Operator.hpp b/include/aidge/operator/Operator.hpp
similarity index 95%
rename from include/operator/Operator.hpp
rename to include/aidge/operator/Operator.hpp
index c302dca1bd3e7b39daf7dcde2a355f4811153157..e8ce72228c9313c0de301738dfc8facd8a87bdf9 100644
--- a/include/operator/Operator.hpp
+++ b/include/aidge/operator/Operator.hpp
@@ -16,10 +16,10 @@
 #include <string>
 #include <vector>
 
-#include "backend/OperatorImpl.hpp"
-#include "data/Data.hpp"
-#include "data/Tensor.hpp"
-#include "utils/Types.h"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/data/Data.hpp"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 
diff --git a/include/operator/Producer.hpp b/include/aidge/operator/Producer.hpp
similarity index 96%
rename from include/operator/Producer.hpp
rename to include/aidge/operator/Producer.hpp
index 58e6dd61d4d9a39535144ff57f32a36585a25a72..5ce01ee38d6477718ee4205c522e51661883c02a 100644
--- a/include/operator/Producer.hpp
+++ b/include/aidge/operator/Producer.hpp
@@ -15,12 +15,12 @@
 #include <array>
 #include <vector>
 
-#include "utils/Types.h"
-#include "data/Tensor.hpp"
-#include "graph/Node.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Parameter.hpp"
-#include "utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Registrar.hpp"
 
 namespace Aidge {
 
diff --git a/include/operator/ReLU.hpp b/include/aidge/operator/ReLU.hpp
similarity index 93%
rename from include/operator/ReLU.hpp
rename to include/aidge/operator/ReLU.hpp
index e6eddd8fdaed1667ab8f2c9d1a3e2d4f76b56bc5..0c8c744b4ed331668b1ff64bc9c03621f5fbfb9b 100644
--- a/include/operator/ReLU.hpp
+++ b/include/aidge/operator/ReLU.hpp
@@ -16,13 +16,13 @@
 #include <memory>
 #include <vector>
 
-#include "utils/Registrar.hpp"
-#include "operator/Operator.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "data/Tensor.hpp"
-#include "data/Data.hpp"
-#include "graph/Node.hpp"
-#include "utils/Types.h"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/data/Data.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 
diff --git a/include/operator/Softmax.hpp b/include/aidge/operator/Softmax.hpp
similarity index 93%
rename from include/operator/Softmax.hpp
rename to include/aidge/operator/Softmax.hpp
index 14ec5c561282912f70d5331234e4db67de641f06..b430c138548344a0fcd4ea1dcd742c3d38288cfe 100644
--- a/include/operator/Softmax.hpp
+++ b/include/aidge/operator/Softmax.hpp
@@ -16,13 +16,13 @@
 #include <memory>
 #include <vector>
 
-#include "utils/Registrar.hpp"
-#include "operator/Operator.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "data/Tensor.hpp"
-#include "data/Data.hpp"
-#include "graph/Node.hpp"
-#include "utils/Types.h"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/data/Data.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
 
 namespace Aidge {
 
diff --git a/include/scheduler/Scheduler.hpp b/include/aidge/scheduler/Scheduler.hpp
similarity index 100%
rename from include/scheduler/Scheduler.hpp
rename to include/aidge/scheduler/Scheduler.hpp
diff --git a/include/utils/CParameter.hpp b/include/aidge/utils/CParameter.hpp
similarity index 100%
rename from include/utils/CParameter.hpp
rename to include/aidge/utils/CParameter.hpp
diff --git a/include/utils/Parameter.hpp b/include/aidge/utils/Parameter.hpp
similarity index 100%
rename from include/utils/Parameter.hpp
rename to include/aidge/utils/Parameter.hpp
diff --git a/include/utils/Recipies.hpp b/include/aidge/utils/Recipies.hpp
similarity index 90%
rename from include/utils/Recipies.hpp
rename to include/aidge/utils/Recipies.hpp
index 71ed8feb96d0b609fce848e3ec026602c02218b6..eeddbe3980935ac426c6cb32845d2f2f84d46dd3 100644
--- a/include/utils/Recipies.hpp
+++ b/include/aidge/utils/Recipies.hpp
@@ -12,8 +12,8 @@
 #ifndef __AIDGE_CORE_UTILS_RECIPIES_H__
 #define __AIDGE_CORE_UTILS_RECIPIES_H__
 
-#include "graph/Node.hpp"
-#include "graph/GraphView.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/graph/GraphView.hpp"
 
 namespace Aidge{
 
diff --git a/include/utils/Registrar.hpp b/include/aidge/utils/Registrar.hpp
similarity index 100%
rename from include/utils/Registrar.hpp
rename to include/aidge/utils/Registrar.hpp
diff --git a/include/utils/Types.h b/include/aidge/utils/Types.h
similarity index 100%
rename from include/utils/Types.h
rename to include/aidge/utils/Types.h
diff --git a/include/utilsParsing/AstNode.hpp b/include/aidge/utilsParsing/AstNode.hpp
similarity index 97%
rename from include/utilsParsing/AstNode.hpp
rename to include/aidge/utilsParsing/AstNode.hpp
index 28d17a543570f9f439fe64047e90b6019ef7a244..1158ae148a22993476adb00ecbf8ebd24101830c 100644
--- a/include/utilsParsing/AstNode.hpp
+++ b/include/aidge/utilsParsing/AstNode.hpp
@@ -7,7 +7,7 @@
 #include <type_traits>
 #include <vector>
 #include <memory>
-#include "utilsParsing/ParsingToken.hpp"
+#include "aidge/utilsParsing/ParsingToken.hpp"
 
 namespace Aidge{
 
diff --git a/include/utilsParsing/ParsingToken.hpp b/include/aidge/utilsParsing/ParsingToken.hpp
similarity index 100%
rename from include/utilsParsing/ParsingToken.hpp
rename to include/aidge/utilsParsing/ParsingToken.hpp
diff --git a/python_binding/backend/pybind_OperatorImpl.cpp b/python_binding/backend/pybind_OperatorImpl.cpp
index ca413a7a2e7bf8e873e416965109106d3a22c787..11189f2f3c4a46b31d8e08d73bea17f27df07765 100644
--- a/python_binding/backend/pybind_OperatorImpl.cpp
+++ b/python_binding/backend/pybind_OperatorImpl.cpp
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 #include <pybind11/pybind11.h>
-#include "backend/OperatorImpl.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/data/pybind_Data.cpp b/python_binding/data/pybind_Data.cpp
index dfa841bdbc70a75967d12ec3eb187b461366a122..3e9f015250acda34f0ae55af38f67df3ca4ad180 100644
--- a/python_binding/data/pybind_Data.cpp
+++ b/python_binding/data/pybind_Data.cpp
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 #include <pybind11/pybind11.h>
-#include "data/Data.hpp"
+#include "aidge/data/Data.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/data/pybind_Tensor.cpp b/python_binding/data/pybind_Tensor.cpp
index 38c01cdd2ff52a627148fc5b4f026f26f6f1632f..3f741946da59a118b023f0204da4f42231c1416d 100644
--- a/python_binding/data/pybind_Tensor.cpp
+++ b/python_binding/data/pybind_Tensor.cpp
@@ -14,11 +14,11 @@
 #include <pybind11/operators.h>
 #include <pybind11/numpy.h>
 
-#include "data/Tensor.hpp"
-#include "data/Data.hpp"
-#include "utils/Registrar.hpp"
-#include "utils/Types.h"
-#include "backend/TensorImpl.hpp"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/data/Data.hpp"
+#include "aidge/utils/Registrar.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/backend/TensorImpl.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/graph/pybind_Connector.cpp b/python_binding/graph/pybind_Connector.cpp
index a937fb4f2afbc30f1d64217215e95ed907ead2cf..5825019c7de8884ad8670b35bb805154f892aec4 100644
--- a/python_binding/graph/pybind_Connector.cpp
+++ b/python_binding/graph/pybind_Connector.cpp
@@ -11,9 +11,9 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
-#include "graph/Connector.hpp"
-#include "graph/Node.hpp"
-#include "graph/GraphView.hpp"
+#include "aidge/graph/Connector.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/graph/GraphView.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/graph/pybind_GraphView.cpp b/python_binding/graph/pybind_GraphView.cpp
index b7ef2e1661a08cfca4814be175fe4e5bb82712a4..54c7e218288a6ffa94cc0c60051bb1a81fe99e1f 100644
--- a/python_binding/graph/pybind_GraphView.cpp
+++ b/python_binding/graph/pybind_GraphView.cpp
@@ -13,10 +13,10 @@
 #include <pybind11/stl.h>
 #include <memory>
 #include <string>
-#include "graph/GraphView.hpp"
-#include "graph/Node.hpp"
-#include "utils/Types.h"
-#include "data/Data.hpp"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/data/Data.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/graph/pybind_Node.cpp b/python_binding/graph/pybind_Node.cpp
index 0d957eb2ca5e32ca33642f2e66116caf302e7cc2..4433bef7e8a7455ca033e621b05221a105de0787 100644
--- a/python_binding/graph/pybind_Node.cpp
+++ b/python_binding/graph/pybind_Node.cpp
@@ -14,9 +14,9 @@
 
 #include <memory>
 
-#include "graph/GraphView.hpp"
-#include "graph/Node.hpp"
-#include "utils/Types.h"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/graph/pybind_OpArgs.cpp b/python_binding/graph/pybind_OpArgs.cpp
index fa7a974312127ab75faa7864bb54f6c1388280fa..305c0b73101a97c242413ff84a5ae099764e7e77 100644
--- a/python_binding/graph/pybind_OpArgs.cpp
+++ b/python_binding/graph/pybind_OpArgs.cpp
@@ -10,9 +10,9 @@
  ********************************************************************************/
 
 #include <pybind11/pybind11.h>
-#include "graph/OpArgs.hpp"
-#include "graph/Node.hpp"
-#include "graph/GraphView.hpp"
+#include "aidge/graph/OpArgs.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/graph/GraphView.hpp"
 #include <pybind11/stl.h>
 #include <pybind11/complex.h>
 #include <pybind11/functional.h>
diff --git a/python_binding/graphmatching/pybind_GRegex.cpp b/python_binding/graphmatching/pybind_GRegex.cpp
index 4eefccec172c284f2cacae83deb1144ccc304fa3..17cfa64bce0e421f6bfebfdf7fad583167716cb0 100644
--- a/python_binding/graphmatching/pybind_GRegex.cpp
+++ b/python_binding/graphmatching/pybind_GRegex.cpp
@@ -11,8 +11,8 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
-#include "graph/GraphView.hpp"
-#include "graphmatching/GRegex.hpp"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/graphmatching/GRegex.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/graphmatching/pybind_Match.cpp b/python_binding/graphmatching/pybind_Match.cpp
index 8646ff91de47ece3e4c72a64dd142607c9d45b0f..c36ca381fe1f370ef03f3df3d34318e800284350 100644
--- a/python_binding/graphmatching/pybind_Match.cpp
+++ b/python_binding/graphmatching/pybind_Match.cpp
@@ -11,7 +11,7 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
-#include "graphmatching/Match.hpp"
+#include "aidge/graphmatching/Match.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/graphmatching/pybind_NodeRegex.cpp b/python_binding/graphmatching/pybind_NodeRegex.cpp
index 1ee4c93323998c1b1e9982b49c82a84b24bb3dcf..76e91c495abfadbe930a260ecde2696fcd41fef4 100644
--- a/python_binding/graphmatching/pybind_NodeRegex.cpp
+++ b/python_binding/graphmatching/pybind_NodeRegex.cpp
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 #include <pybind11/pybind11.h>
-#include "graphmatching/NodeRegex.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_Add.cpp b/python_binding/operator/pybind_Add.cpp
index 3585db040b9f12004bc8b7f47c7907dbbcc5f96a..d7099e3856d48262f0f4bbacf025f5a960a220fa 100644
--- a/python_binding/operator/pybind_Add.cpp
+++ b/python_binding/operator/pybind_Add.cpp
@@ -11,11 +11,11 @@
 
 #include <pybind11/pybind11.h>
 
-#include "operator/Add.hpp"
-#include "utils/Parameter.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Types.h"
+#include "aidge/operator/Add.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Types.h"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_AvgPooling.cpp b/python_binding/operator/pybind_AvgPooling.cpp
index 142f29b5c8cc8b4b8f13de75915399761fd82383..66dadba7244a199bd4ca8a0dd814f20a8049a62f 100644
--- a/python_binding/operator/pybind_AvgPooling.cpp
+++ b/python_binding/operator/pybind_AvgPooling.cpp
@@ -16,12 +16,12 @@
 #include <vector>
 #include <array>
 
-#include "utils/Parameter.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "operator/AvgPooling.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Types.h"
-#include "data/Tensor.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/AvgPooling.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/data/Tensor.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_BatchNorm.cpp b/python_binding/operator/pybind_BatchNorm.cpp
index 579b983bc7a55026453507f793c0e2a52951a448..52578c55ac0e3e1112bdbedc15bbaa3e155d9b44 100644
--- a/python_binding/operator/pybind_BatchNorm.cpp
+++ b/python_binding/operator/pybind_BatchNorm.cpp
@@ -12,10 +12,10 @@
 #include <pybind11/pybind11.h>
 #include <string>
 
-#include "operator/BatchNorm.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Parameter.hpp"
-#include "utils/Types.h"
+#include "aidge/operator/BatchNorm.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/utils/Types.h"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_Conv.cpp b/python_binding/operator/pybind_Conv.cpp
index 663afe1bbeb6b37215a37351a2bd26f7a275458e..3cf5d818f9b6e3bdfaf9a2d0b74ec0480beb6967 100644
--- a/python_binding/operator/pybind_Conv.cpp
+++ b/python_binding/operator/pybind_Conv.cpp
@@ -16,11 +16,11 @@
 #include <vector>
 #include <array>
 
-#include "utils/Parameter.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "operator/Conv.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Types.h"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/Conv.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Types.h"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_ConvDepthWise.cpp b/python_binding/operator/pybind_ConvDepthWise.cpp
index bbd888d1ba2f9b34e11c1c53f58c904741733913..b64409bdbb5f094e85cb094017a6fb837893a2db 100644
--- a/python_binding/operator/pybind_ConvDepthWise.cpp
+++ b/python_binding/operator/pybind_ConvDepthWise.cpp
@@ -16,12 +16,12 @@
 #include <vector>
 #include <array>
 
-#include "utils/Parameter.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "operator/ConvDepthWise.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Types.h"
-#include "data/Tensor.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/ConvDepthWise.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/data/Tensor.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_FC.cpp b/python_binding/operator/pybind_FC.cpp
index 293ae841818b979aa357dd54703834aba0264d45..550f040210c219b2956313e0c3ea1cdce63429aa 100644
--- a/python_binding/operator/pybind_FC.cpp
+++ b/python_binding/operator/pybind_FC.cpp
@@ -11,11 +11,11 @@
 
 #include <pybind11/pybind11.h>
 
-#include "operator/FC.hpp"
-#include "utils/Parameter.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Types.h"
+#include "aidge/operator/FC.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Types.h"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_GenericOperator.cpp b/python_binding/operator/pybind_GenericOperator.cpp
index 7aa5d42ba1085c36a61c8887d5f4520652fd34b5..578d2ccd2ed143c3f9a67c0430c12aa7214cb8dc 100644
--- a/python_binding/operator/pybind_GenericOperator.cpp
+++ b/python_binding/operator/pybind_GenericOperator.cpp
@@ -13,9 +13,9 @@
 #include <pybind11/stl.h>
 #include <stdio.h>
 
-#include "backend/OperatorImpl.hpp"
-#include "operator/GenericOperator.hpp"
-#include "operator/Operator.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/GenericOperator.hpp"
+#include "aidge/operator/Operator.hpp"
 namespace py = pybind11;
 namespace Aidge {
 
diff --git a/python_binding/operator/pybind_LeakyReLU.cpp b/python_binding/operator/pybind_LeakyReLU.cpp
index b8ffb9c5d08eb1ea0fdcc29bcae5778350b45214..27a292f0baf2673f3d963f3c3b9a69892c4c6521 100644
--- a/python_binding/operator/pybind_LeakyReLU.cpp
+++ b/python_binding/operator/pybind_LeakyReLU.cpp
@@ -11,9 +11,9 @@
 
 #include <pybind11/pybind11.h>
 
-#include "operator/LeakyReLU.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Parameter.hpp"
+#include "aidge/operator/LeakyReLU.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Parameter.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_Matmul.cpp b/python_binding/operator/pybind_Matmul.cpp
index 7a2748fcd87b4e7d62c070b7fe2cc32762593ec0..a26caeba326aba28490c15aa7264f4895640c3b3 100644
--- a/python_binding/operator/pybind_Matmul.cpp
+++ b/python_binding/operator/pybind_Matmul.cpp
@@ -11,11 +11,11 @@
 
 #include <pybind11/pybind11.h>
 
-#include "operator/Matmul.hpp"
-#include "utils/Parameter.hpp"
-#include "backend/OperatorImpl.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Types.h"
+#include "aidge/operator/Matmul.hpp"
+#include "aidge/utils/Parameter.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Types.h"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_Operator.cpp b/python_binding/operator/pybind_Operator.cpp
index cf682cc73f0f56334fb1bbb549fa88ec404f4167..ac9a34e0a14ace2cf264188302f52a27bf0f7222 100644
--- a/python_binding/operator/pybind_Operator.cpp
+++ b/python_binding/operator/pybind_Operator.cpp
@@ -10,8 +10,8 @@
  ********************************************************************************/
 
 #include <pybind11/pybind11.h>
-#include "backend/OperatorImpl.hpp"
-#include "operator/Operator.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/Operator.hpp"
 #include <pybind11/stl.h>
 
 namespace py = pybind11;
diff --git a/python_binding/operator/pybind_Producer.cpp b/python_binding/operator/pybind_Producer.cpp
index c47329941d32d57423301121196d27e7d98a4837..5757891a30c5b40dcfa5ff99b1f06e00376f475a 100644
--- a/python_binding/operator/pybind_Producer.cpp
+++ b/python_binding/operator/pybind_Producer.cpp
@@ -12,12 +12,12 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "utils/Types.h"
-#include "utils/Parameter.hpp"
-// #include "backend/OperatorImpl.hpp"
-#include "operator/Operator.hpp"
-#include "operator/Producer.hpp"
-#include "data/Tensor.hpp"
+#include "aidge/utils/Types.h"
+#include "aidge/utils/Parameter.hpp"
+// #include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/data/Tensor.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_ReLU.cpp b/python_binding/operator/pybind_ReLU.cpp
index 794951828a811def6ac4dc52f3af9a28317f79d5..e0d34d5a91a4ed1fcb8507198eb222b2d02e4e26 100644
--- a/python_binding/operator/pybind_ReLU.cpp
+++ b/python_binding/operator/pybind_ReLU.cpp
@@ -11,8 +11,8 @@
 
 #include <pybind11/pybind11.h>
 
-#include "operator/ReLU.hpp"
-#include "operator/Operator.hpp"
+#include "aidge/operator/ReLU.hpp"
+#include "aidge/operator/Operator.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/operator/pybind_Softmax.cpp b/python_binding/operator/pybind_Softmax.cpp
index 1cccab6e382b3ae65e68adc62c4c874de51856c7..13ba96ade4f5c5d132274e457efa5b4edcd3dc78 100644
--- a/python_binding/operator/pybind_Softmax.cpp
+++ b/python_binding/operator/pybind_Softmax.cpp
@@ -12,8 +12,8 @@
 #include <pybind11/pybind11.h>
 #include <string>
 
-#include "operator/Softmax.hpp"
-#include "operator/Operator.hpp"
+#include "aidge/operator/Softmax.hpp"
+#include "aidge/operator/Operator.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/recipies/pybind_Recipies.cpp b/python_binding/recipies/pybind_Recipies.cpp
index c9a1e03846d7c205aaf97e0133cec5ac443d7c19..4746aeacf2bf6ad43306b60660ecd0bace0a7ab5 100644
--- a/python_binding/recipies/pybind_Recipies.cpp
+++ b/python_binding/recipies/pybind_Recipies.cpp
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include "utils/Recipies.hpp"
+#include "aidge/utils/Recipies.hpp"
 
 namespace py = pybind11;
 
diff --git a/python_binding/scheduler/pybind_Scheduler.cpp b/python_binding/scheduler/pybind_Scheduler.cpp
index 0f2598c750500b219a8de9c31c5c9d7e9eccae7c..2490d5c55a497223b13bceee6772c2dd44e733ef 100644
--- a/python_binding/scheduler/pybind_Scheduler.cpp
+++ b/python_binding/scheduler/pybind_Scheduler.cpp
@@ -10,8 +10,8 @@
  ********************************************************************************/
 
 #include <pybind11/pybind11.h>
-#include "scheduler/Scheduler.hpp"
-#include "graph/GraphView.hpp"
+#include "aidge/scheduler/Scheduler.hpp"
+#include "aidge/graph/GraphView.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/python_binding/utils/pybind_Parameter.cpp b/python_binding/utils/pybind_Parameter.cpp
index 95d7d93a32ca000619240c35af805da1b09b558d..358316ea00413813d6d482a8a4601e69af3aa992 100644
--- a/python_binding/utils/pybind_Parameter.cpp
+++ b/python_binding/utils/pybind_Parameter.cpp
@@ -1,5 +1,5 @@
 #include <pybind11/pybind11.h>
-#include "utils/Parameter.hpp"
+#include "aidge/utils/Parameter.hpp"
 
 namespace py = pybind11;
 namespace Aidge {
diff --git a/src/graph/Connector.cpp b/src/graph/Connector.cpp
index 4297453f80506fbac65c2ea5a7df257dd2d84b6f..ca35b38ad20584c56dad0c178ee90ab94a14cd29 100644
--- a/src/graph/Connector.cpp
+++ b/src/graph/Connector.cpp
@@ -9,13 +9,13 @@
  *
  ********************************************************************************/
 
-#include "graph/Connector.hpp"
+#include "aidge/graph/Connector.hpp"
 
 #include <map>
 
-#include "graph/GraphView.hpp"
-#include "graph/Node.hpp"
-#include "utils/Types.h"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
 
 Aidge::Connector::Connector(std::shared_ptr<Aidge::Node> node) {
     mNode = node;
diff --git a/src/graph/GraphView.cpp b/src/graph/GraphView.cpp
index 518f1859fbb5f2864a61731b34bfb1a61b91cf8e..1b4b1a511e91e810195ccce6b7d2ebf8d84d3c70 100644
--- a/src/graph/GraphView.cpp
+++ b/src/graph/GraphView.cpp
@@ -14,9 +14,9 @@
 #include <iterator>
 #include <utility>
 
-#include <utils/Types.h>
-#include "graph/GraphView.hpp"
-#include <data/Tensor.hpp>
+#include "aidge/utils/Types.h"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/data/Tensor.hpp"
 
 ///////////////////////////////////////////////////////
 //        FUNCTIONAL DESCRIPTION
diff --git a/src/graph/Node.cpp b/src/graph/Node.cpp
index 37cb84e4f45457308a4e52417cb2946e9418ccc4..6104d49dd121ffe885c077e72358684319eabb76 100644
--- a/src/graph/Node.cpp
+++ b/src/graph/Node.cpp
@@ -9,13 +9,13 @@
  *
  ********************************************************************************/
 
-#include "graph/Node.hpp"
+#include "aidge/graph/Node.hpp"
 
-#include "graph/GraphView.hpp"
-#include "operator/Producer.hpp"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/operator/Producer.hpp"
 #include <memory>
 #include <vector>
-#include "utils/Types.h"
+#include "aidge/utils/Types.h"
 
 Aidge::Node::Node(std::shared_ptr<Operator> op, const char *name)
     : mName((name == nullptr) ? std::string() : std::string(name)),
diff --git a/src/graph/OpArgs.cpp b/src/graph/OpArgs.cpp
index 93ceff0aafb0228915db5d672db15b53ca3e233e..52018e1cddca6ab5b8d709f4bc7b64bf067ecad2 100644
--- a/src/graph/OpArgs.cpp
+++ b/src/graph/OpArgs.cpp
@@ -9,9 +9,9 @@
  *
  ********************************************************************************/
 
-#include "graph/Node.hpp"
-#include "graph/GraphView.hpp"
-#include "graph/OpArgs.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/graph/OpArgs.hpp"
 
 
 std::shared_ptr<Aidge::GraphView> Aidge::Sequential(std::initializer_list<OpArgs> inputs) {
diff --git a/src/graphmatching/GRegex.cpp b/src/graphmatching/GRegex.cpp
index 80bc724c195019ada98dbca5a621a23139a55d05..6b54c5a476e0319c3fab0751c0528a2084ebc0a7 100644
--- a/src/graphmatching/GRegex.cpp
+++ b/src/graphmatching/GRegex.cpp
@@ -9,8 +9,8 @@
  *
  ********************************************************************************/
 
-#include "graphmatching/GRegex.hpp"
-#include "graph/GraphView.hpp"
+#include "aidge/graphmatching/GRegex.hpp"
+#include "aidge/graph/GraphView.hpp"
 
 using namespace Aidge; 
 
diff --git a/src/graphmatching/Match.cpp b/src/graphmatching/Match.cpp
index 9a87fac7dc3173556bff93a0bcf0a69a4c37f2dd..6c08b30b11ab220310b476bab2c6d17ed86e4fd1 100644
--- a/src/graphmatching/Match.cpp
+++ b/src/graphmatching/Match.cpp
@@ -9,7 +9,7 @@
  *
  ********************************************************************************/
 
-#include "graphmatching/Match.hpp"
+#include "aidge/graphmatching/Match.hpp"
 
 using namespace Aidge; 
 
diff --git a/src/graphmatching/NodeRegex.cpp b/src/graphmatching/NodeRegex.cpp
index 8ba6332dd8a82232ae478fccb46174251533474b..bbb116d1b12a31b491b26d2a64d04b416b61c6b7 100644
--- a/src/graphmatching/NodeRegex.cpp
+++ b/src/graphmatching/NodeRegex.cpp
@@ -9,7 +9,7 @@
  *
  ********************************************************************************/
 
-#include "graphmatching/NodeRegex.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
 
 
 // Verification done by the Parameter system
diff --git a/src/graphmatching/SeqStm.cpp b/src/graphmatching/SeqStm.cpp
index 89c932bcea383bd4c79b84294888e870e9dfccd2..84553cb44cb898535943b31b8c955378e73ccbd5 100755
--- a/src/graphmatching/SeqStm.cpp
+++ b/src/graphmatching/SeqStm.cpp
@@ -9,7 +9,7 @@
  *
  ********************************************************************************/
 
-#include "graphmatching/SeqStm.hpp"
+#include "aidge/graphmatching/SeqStm.hpp"
 
 using namespace Aidge; 
 
diff --git a/src/graphmatching/StmFactory.cpp b/src/graphmatching/StmFactory.cpp
index 4ca9c6d256ed5f9405892599dfdafbba76284b40..30b1fad81fc9e7f97dab03f7e6d091a27eeec32b 100644
--- a/src/graphmatching/StmFactory.cpp
+++ b/src/graphmatching/StmFactory.cpp
@@ -9,7 +9,7 @@
  *
  ********************************************************************************/
 
-#include "graphmatching/StmFactory.hpp"
+#include "aidge/graphmatching/StmFactory.hpp"
 
 using namespace Aidge;
 
diff --git a/src/operator/Operator.cpp b/src/operator/Operator.cpp
index 7eb9e7cdcca408680ef97cdf0f068b4992e379e5..99b07235e2917527160f03af997747f02947dcf9 100644
--- a/src/operator/Operator.cpp
+++ b/src/operator/Operator.cpp
@@ -11,9 +11,9 @@
 
 #include <cassert>
 
-#include "backend/OperatorImpl.hpp"
-#include "operator/Operator.hpp"
-#include "utils/Types.h"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/Operator.hpp"
+#include "aidge/utils/Types.h"
 
 // constexpr Aidge::Operator::Operator(const char* type)
 //     : mType(type)
diff --git a/src/recipies/FuseMulAdd.cpp b/src/recipies/FuseMulAdd.cpp
index e37311a04e6b5738bc7132fd2ccbbd872649f8eb..dc565bf0acc7747d79ec12df973a82d86fc79503 100644
--- a/src/recipies/FuseMulAdd.cpp
+++ b/src/recipies/FuseMulAdd.cpp
@@ -14,12 +14,12 @@
 #include <memory>
 #include <string>
 
-#include "operator/FC.hpp"
-#include "utils/Recipies.hpp"
-#include "graph/GraphView.hpp"
-#include "graph/Node.hpp"
-#include "operator/Producer.hpp"
-#include "operator/GenericOperator.hpp"
+#include "aidge/operator/FC.hpp"
+#include "aidge/utils/Recipies.hpp"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/operator/GenericOperator.hpp"
 
 using namespace Aidge;
 
diff --git a/src/recipies/RemoveFlatten.cpp b/src/recipies/RemoveFlatten.cpp
index 0a28c476739cdc4940c4069360922897e9af74c3..23a9d645af52d0fe6af0b4d03f773a550b104e0c 100644
--- a/src/recipies/RemoveFlatten.cpp
+++ b/src/recipies/RemoveFlatten.cpp
@@ -11,9 +11,9 @@
 
 #include <memory>
 
-#include "graph/Node.hpp"
-#include "graph/GraphView.hpp"
-#include "utils/Recipies.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/utils/Recipies.hpp"
 
 namespace Aidge {
     void removeFlatten(std::shared_ptr<GraphView> view) {
diff --git a/src/scheduler/Scheduler.cpp b/src/scheduler/Scheduler.cpp
index 5f4b0295be212ef41353410015545156bcc98370..24953ccb0454c91eb5894552c8c814d304a3638c 100644
--- a/src/scheduler/Scheduler.cpp
+++ b/src/scheduler/Scheduler.cpp
@@ -9,16 +9,16 @@
  *
  ********************************************************************************/
 
-#include "scheduler/Scheduler.hpp"
+#include "aidge/scheduler/Scheduler.hpp"
 
 #include <chrono>
 #include <memory>
 #include <set>
 #include <string>
 
-#include "graph/GraphView.hpp"
-#include "graph/Node.hpp"
-#include "utils/Types.h"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/utils/Types.h"
 
 void drawProgressBar(double progress, int barWidth, const char* additionalInfo = nullptr) {
     putchar('[');
diff --git a/tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
similarity index 100%
rename from tests/CMakeLists.txt
rename to unit_tests/CMakeLists.txt
diff --git a/tests/graph/Test_Connector.cpp b/unit_tests/graph/Test_Connector.cpp
similarity index 98%
rename from tests/graph/Test_Connector.cpp
rename to unit_tests/graph/Test_Connector.cpp
index bde2c90260996f091f3aaa70fc8545447e6f6728..b82c9af05d88111d424c22f92e441058ea870ff9 100644
--- a/tests/graph/Test_Connector.cpp
+++ b/unit_tests/graph/Test_Connector.cpp
@@ -11,11 +11,11 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "graph/Connector.hpp"
-#include "graph/Node.hpp"
-#include "operator/GenericOperator.hpp"
-#include "graph/GraphView.hpp"
-#include "graph/OpArgs.hpp"
+#include "aidge/graph/Connector.hpp"
+#include "aidge/graph/Node.hpp"
+#include "aidge/operator/GenericOperator.hpp"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/graph/OpArgs.hpp"
 
 using namespace Aidge;
 
diff --git a/tests/graph/Test_GraphView.cpp b/unit_tests/graph/Test_GraphView.cpp
similarity index 96%
rename from tests/graph/Test_GraphView.cpp
rename to unit_tests/graph/Test_GraphView.cpp
index ec5b825257c85213cbf358fd334b9f6dab5b29a6..9fb7a10029e212f4071d2f25f86deead078902a1 100644
--- a/tests/graph/Test_GraphView.cpp
+++ b/unit_tests/graph/Test_GraphView.cpp
@@ -16,12 +16,12 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "backend/OperatorImpl.hpp"
-#include "data/Tensor.hpp"
-#include "graph/GraphView.hpp"
-#include "operator/Conv.hpp"
-#include "operator/GenericOperator.hpp"
-#include "operator/Producer.hpp"
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/data/Tensor.hpp"
+#include "aidge/graph/GraphView.hpp"
+#include "aidge/operator/Conv.hpp"
+#include "aidge/operator/GenericOperator.hpp"
+#include "aidge/operator/Producer.hpp"
 
 using namespace Aidge;
 
diff --git a/tests/graphMatching/Test_GRegex.cpp b/unit_tests/graphMatching/Test_GRegex.cpp
similarity index 96%
rename from tests/graphMatching/Test_GRegex.cpp
rename to unit_tests/graphMatching/Test_GRegex.cpp
index 9f600ea3feed93eb6f32f65b176bf2e7fe116a74..7184fad76a921239753d4752ae1a4a61bf3aec16 100644
--- a/tests/graphMatching/Test_GRegex.cpp
+++ b/unit_tests/graphMatching/Test_GRegex.cpp
@@ -18,16 +18,16 @@
 
 #include <catch2/catch_test_macros.hpp>
 //test
-#include <graphmatching/GRegex.hpp>
-#include <graphmatching/StmFactory.hpp>
-#include <graphmatching/SeqStm.hpp>
-#include <graphmatching/NodeRegex.hpp>
-#include <graphmatching/Match.hpp>
+#include "aidge/graphmatching/GRegex.hpp"
+#include "aidge/graphmatching/StmFactory.hpp"
+#include "aidge/graphmatching/SeqStm.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
+#include "aidge/graphmatching/Match.hpp"
 //use
-#include <backend/OperatorImpl.hpp>
-#include <operator/GenericOperator.hpp>
-#include <operator/Producer.hpp>
-#include <graph/GraphView.hpp>
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/GenericOperator.hpp"
+#include "aidge/operator/Producer.hpp"
+#include "aidge/graph/GraphView.hpp"
 
 using namespace Aidge;
 
diff --git a/tests/graphMatching/Test_NodeRegex.cpp b/unit_tests/graphMatching/Test_NodeRegex.cpp
similarity index 90%
rename from tests/graphMatching/Test_NodeRegex.cpp
rename to unit_tests/graphMatching/Test_NodeRegex.cpp
index fd583a040a1b30e0108d3b5faa6b9db75a8277bf..2866642bf1355f49a451edffec9e1b62c802ae1f 100644
--- a/tests/graphMatching/Test_NodeRegex.cpp
+++ b/unit_tests/graphMatching/Test_NodeRegex.cpp
@@ -16,9 +16,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <backend/OperatorImpl.hpp>
-#include <graphmatching/NodeRegex.hpp>
-#include <operator/GenericOperator.hpp>
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
+#include "aidge/operator/GenericOperator.hpp"
 
 
 using namespace Aidge;
diff --git a/tests/graphMatching/Test_SeqStm.cpp b/unit_tests/graphMatching/Test_SeqStm.cpp
similarity index 95%
rename from tests/graphMatching/Test_SeqStm.cpp
rename to unit_tests/graphMatching/Test_SeqStm.cpp
index 209bde758138f753a97f6c14cd6331abd1026720..baabbbc3c10ec751c64a65ab01c2c4d502f58cb5 100644
--- a/tests/graphMatching/Test_SeqStm.cpp
+++ b/unit_tests/graphMatching/Test_SeqStm.cpp
@@ -18,12 +18,12 @@
 
 #include <catch2/catch_test_macros.hpp>
 //test
-#include <graphmatching/SeqStm.hpp>
-#include <graphmatching/NodeRegex.hpp>
+#include "aidge/graphmatching/SeqStm.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
 //use
-#include <backend/OperatorImpl.hpp>
-#include <operator/GenericOperator.hpp>
-#include <operator/Producer.hpp>
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/GenericOperator.hpp"
+#include "aidge/operator/Producer.hpp"
 
 using namespace Aidge;
 
diff --git a/tests/graphMatching/Test_StmFactory.cpp b/unit_tests/graphMatching/Test_StmFactory.cpp
similarity index 96%
rename from tests/graphMatching/Test_StmFactory.cpp
rename to unit_tests/graphMatching/Test_StmFactory.cpp
index 2bc3471d3314ffae67b1c9e9bb7f612cdf3fda30..b595372fd97a56f2ecf2575429c63db92484bbc0 100644
--- a/tests/graphMatching/Test_StmFactory.cpp
+++ b/unit_tests/graphMatching/Test_StmFactory.cpp
@@ -18,12 +18,12 @@
 
 #include <catch2/catch_test_macros.hpp>
 //test
-#include <graphmatching/StmFactory.hpp>
-#include <graphmatching/NodeRegex.hpp>
+#include "aidge/graphmatching/StmFactory.hpp"
+#include "aidge/graphmatching/NodeRegex.hpp"
 //use
-#include <backend/OperatorImpl.hpp>
-#include <operator/GenericOperator.hpp>
-#include <operator/Producer.hpp>
+#include "aidge/backend/OperatorImpl.hpp"
+#include "aidge/operator/GenericOperator.hpp"
+#include "aidge/operator/Producer.hpp"
 
 using namespace Aidge;
 
diff --git a/tests/operator/Test_GenericOperator.cpp b/unit_tests/operator/Test_GenericOperator.cpp
similarity index 97%
rename from tests/operator/Test_GenericOperator.cpp
rename to unit_tests/operator/Test_GenericOperator.cpp
index ef7614431f7233fd387019f08b02ed6467487d8f..44e9b32f0cde49971dba5aa6e857e651a4e945cf 100644
--- a/tests/operator/Test_GenericOperator.cpp
+++ b/unit_tests/operator/Test_GenericOperator.cpp
@@ -11,8 +11,8 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "operator/GenericOperator.hpp"
-#include "graph/GraphView.hpp"
+#include "aidge/operator/GenericOperator.hpp"
+#include "aidge/graph/GraphView.hpp"
 #include <cstddef>
 
 using namespace Aidge;