diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2c316b..98bef9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,9 +181,9 @@ CheckPartestInstall(${BUILD_TESTS} partest_includepath partest_libpath)
 add_subdirectory(base_c)
 add_subdirectory(base_cpp)
 add_subdirectory(mtapi_c)
-add_subdirectory(mtapi_network_c)
+add_subdirectory(mtapi_plugins_c/mtapi_network_c)
 if(OpenCL_FOUND)
-  add_subdirectory(mtapi_opencl_c)
+  add_subdirectory(mtapi_plugins_c/mtapi_opencl_c)
 endif()
 add_subdirectory(tasks_cpp)
 add_subdirectory(mtapi_cpp)
diff --git a/doc/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt
index d68a8a3..a6e0f72 100644
--- a/doc/examples/CMakeLists.txt
+++ b/doc/examples/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/../../base_cpp/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_c/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_c/src
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_network_c/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_plugins_c/mtapi_network_c/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_cpp/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../../tasks_cpp/include
   ${CMAKE_CURRENT_BINARY_DIR}/../../tasks_cpp/include
@@ -26,7 +26,7 @@ if(OpenCL_FOUND)
   add_definitions(-DEMBB_WITH_OPENCL)
   # add opencl includes
   include_directories( 
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_opencl_c/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_plugins_c/mtapi_opencl_c/include
   )
   # later used, to link opencl to target...
   set (EMBB_MTAPI_OPENCL_C_CONDITIONAL "embb_mtapi_opencl_c")
diff --git a/mtapi_network_c/CMakeLists.txt b/mtapi_plugins_c/mtapi_network_c/CMakeLists.txt
similarity index 87%
rename from mtapi_network_c/CMakeLists.txt
rename to mtapi_plugins_c/mtapi_network_c/CMakeLists.txt
index c5b8fc2..a23a903 100644
--- a/mtapi_network_c/CMakeLists.txt
+++ b/mtapi_plugins_c/mtapi_network_c/CMakeLists.txt
@@ -26,17 +26,17 @@ GroupSourcesMSVC(test)
 
 set (EMBB_MTAPI_NETWORK_INCLUDE_DIRS "include" "src" "test")
 include_directories(${EMBB_MTAPI_NETWORK_INCLUDE_DIRS}
-                    ${CMAKE_CURRENT_SOURCE_DIR}/../base_c/include
-                    ${CMAKE_CURRENT_BINARY_DIR}/../base_c/include
-                    ${CMAKE_CURRENT_SOURCE_DIR}/../mtapi_c/include
-                    ${CMAKE_CURRENT_SOURCE_DIR}/../mtapi_c/src
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../../base_c/include
+                    ${CMAKE_CURRENT_BINARY_DIR}/../../base_c/include
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_c/include
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_c/src
                     )
 
 add_library(embb_mtapi_network_c ${EMBB_MTAPI_NETWORK_C_SOURCES} ${EMBB_MTAPI_NETWORK_C_HEADERS})
 target_link_libraries(embb_mtapi_network_c embb_mtapi_c embb_base_c)
 
 if (BUILD_TESTS STREQUAL ON)
-  include_directories(${CMAKE_CURRENT_BINARY_DIR}/../partest/include)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../partest/include)
   add_executable (embb_mtapi_network_c_test ${EMBB_MTAPI_NETWORK_TEST_SOURCES})
   target_link_libraries(embb_mtapi_network_c_test embb_mtapi_network_c embb_mtapi_c partest embb_base_c ${compiler_libs} ${EMBB_MTAPI_NETWORK_C_LIBS})
   CopyBin(BIN embb_mtapi_network_c_test DEST ${local_install_dir})
diff --git a/mtapi_network_c/include/embb/mtapi/c/mtapi_network.h b/mtapi_plugins_c/mtapi_network_c/include/embb/mtapi/c/mtapi_network.h
similarity index 100%
rename from mtapi_network_c/include/embb/mtapi/c/mtapi_network.h
rename to mtapi_plugins_c/mtapi_network_c/include/embb/mtapi/c/mtapi_network.h
diff --git a/mtapi_network_c/src/embb_mtapi_network.c b/mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network.c
similarity index 100%
rename from mtapi_network_c/src/embb_mtapi_network.c
rename to mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network.c
diff --git a/mtapi_network_c/src/embb_mtapi_network.h b/mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network.h
similarity index 100%
rename from mtapi_network_c/src/embb_mtapi_network.h
rename to mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network.h
diff --git a/mtapi_network_c/src/embb_mtapi_network_buffer.c b/mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network_buffer.c
similarity index 100%
rename from mtapi_network_c/src/embb_mtapi_network_buffer.c
rename to mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network_buffer.c
diff --git a/mtapi_network_c/src/embb_mtapi_network_buffer.h b/mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network_buffer.h
similarity index 100%
rename from mtapi_network_c/src/embb_mtapi_network_buffer.h
rename to mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network_buffer.h
diff --git a/mtapi_network_c/src/embb_mtapi_network_socket.c b/mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network_socket.c
similarity index 100%
rename from mtapi_network_c/src/embb_mtapi_network_socket.c
rename to mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network_socket.c
diff --git a/mtapi_network_c/src/embb_mtapi_network_socket.h b/mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network_socket.h
similarity index 100%
rename from mtapi_network_c/src/embb_mtapi_network_socket.h
rename to mtapi_plugins_c/mtapi_network_c/src/embb_mtapi_network_socket.h
diff --git a/mtapi_network_c/test/embb_mtapi_network_test_buffer.cc b/mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_buffer.cc
similarity index 100%
rename from mtapi_network_c/test/embb_mtapi_network_test_buffer.cc
rename to mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_buffer.cc
diff --git a/mtapi_network_c/test/embb_mtapi_network_test_buffer.h b/mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_buffer.h
similarity index 100%
rename from mtapi_network_c/test/embb_mtapi_network_test_buffer.h
rename to mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_buffer.h
diff --git a/mtapi_network_c/test/embb_mtapi_network_test_socket.cc b/mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_socket.cc
similarity index 100%
rename from mtapi_network_c/test/embb_mtapi_network_test_socket.cc
rename to mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_socket.cc
diff --git a/mtapi_network_c/test/embb_mtapi_network_test_socket.h b/mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_socket.h
similarity index 100%
rename from mtapi_network_c/test/embb_mtapi_network_test_socket.h
rename to mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_socket.h
diff --git a/mtapi_network_c/test/embb_mtapi_network_test_task.cc b/mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_task.cc
similarity index 100%
rename from mtapi_network_c/test/embb_mtapi_network_test_task.cc
rename to mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_task.cc
diff --git a/mtapi_network_c/test/embb_mtapi_network_test_task.h b/mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_task.h
similarity index 100%
rename from mtapi_network_c/test/embb_mtapi_network_test_task.h
rename to mtapi_plugins_c/mtapi_network_c/test/embb_mtapi_network_test_task.h
diff --git a/mtapi_network_c/test/main.cc b/mtapi_plugins_c/mtapi_network_c/test/main.cc
similarity index 100%
rename from mtapi_network_c/test/main.cc
rename to mtapi_plugins_c/mtapi_network_c/test/main.cc
diff --git a/mtapi_opencl_c/CMakeLists.txt b/mtapi_plugins_c/mtapi_opencl_c/CMakeLists.txt
similarity index 87%
rename from mtapi_opencl_c/CMakeLists.txt
rename to mtapi_plugins_c/mtapi_opencl_c/CMakeLists.txt
index 6fe7561..7dd94de 100644
--- a/mtapi_opencl_c/CMakeLists.txt
+++ b/mtapi_plugins_c/mtapi_opencl_c/CMakeLists.txt
@@ -26,17 +26,17 @@ GroupSourcesMSVC(test)
 
 set (EMBB_MTAPI_OPENCL_INCLUDE_DIRS "include" "src" "test")
 include_directories(${EMBB_MTAPI_OPENCL_INCLUDE_DIRS}
-                    ${CMAKE_CURRENT_SOURCE_DIR}/../base_c/include
-                    ${CMAKE_CURRENT_BINARY_DIR}/../base_c/include
-                    ${CMAKE_CURRENT_SOURCE_DIR}/../mtapi_c/include
-                    ${CMAKE_CURRENT_SOURCE_DIR}/../mtapi_c/src
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../../base_c/include
+                    ${CMAKE_CURRENT_BINARY_DIR}/../../base_c/include
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_c/include
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../../mtapi_c/src
                     )
 
 add_library(embb_mtapi_opencl_c ${EMBB_MTAPI_OPENCL_C_SOURCES} ${EMBB_MTAPI_OPENCL_C_HEADERS})
 target_link_libraries(embb_mtapi_opencl_c embb_mtapi_c embb_base_c)
 
 if (BUILD_TESTS STREQUAL ON)
-  include_directories(${CMAKE_CURRENT_BINARY_DIR}/../partest/include)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../partest/include)
   add_executable (embb_mtapi_opencl_c_test ${EMBB_MTAPI_OPENCL_TEST_SOURCES})
   target_link_libraries(embb_mtapi_opencl_c_test embb_mtapi_opencl_c embb_mtapi_c partest embb_base_c ${compiler_libs} ${EMBB_MTAPI_OPENCL_C_LIBS})
   CopyBin(BIN embb_mtapi_opencl_c_test DEST ${local_install_dir})
diff --git a/mtapi_opencl_c/include/embb/mtapi/c/mtapi_opencl.h b/mtapi_plugins_c/mtapi_opencl_c/include/embb/mtapi/c/mtapi_opencl.h
similarity index 100%
rename from mtapi_opencl_c/include/embb/mtapi/c/mtapi_opencl.h
rename to mtapi_plugins_c/mtapi_opencl_c/include/embb/mtapi/c/mtapi_opencl.h
diff --git a/mtapi_opencl_c/src/CL/cl.h b/mtapi_plugins_c/mtapi_opencl_c/src/CL/cl.h
similarity index 100%
rename from mtapi_opencl_c/src/CL/cl.h
rename to mtapi_plugins_c/mtapi_opencl_c/src/CL/cl.h
diff --git a/mtapi_opencl_c/src/CL/cl_ext.h b/mtapi_plugins_c/mtapi_opencl_c/src/CL/cl_ext.h
similarity index 100%
rename from mtapi_opencl_c/src/CL/cl_ext.h
rename to mtapi_plugins_c/mtapi_opencl_c/src/CL/cl_ext.h
diff --git a/mtapi_opencl_c/src/CL/cl_gl.h b/mtapi_plugins_c/mtapi_opencl_c/src/CL/cl_gl.h
similarity index 100%
rename from mtapi_opencl_c/src/CL/cl_gl.h
rename to mtapi_plugins_c/mtapi_opencl_c/src/CL/cl_gl.h
diff --git a/mtapi_opencl_c/src/CL/cl_gl_ext.h b/mtapi_plugins_c/mtapi_opencl_c/src/CL/cl_gl_ext.h
similarity index 100%
rename from mtapi_opencl_c/src/CL/cl_gl_ext.h
rename to mtapi_plugins_c/mtapi_opencl_c/src/CL/cl_gl_ext.h
diff --git a/mtapi_opencl_c/src/CL/cl_platform.h b/mtapi_plugins_c/mtapi_opencl_c/src/CL/cl_platform.h
similarity index 100%
rename from mtapi_opencl_c/src/CL/cl_platform.h
rename to mtapi_plugins_c/mtapi_opencl_c/src/CL/cl_platform.h
diff --git a/mtapi_opencl_c/src/CL/opencl.h b/mtapi_plugins_c/mtapi_opencl_c/src/CL/opencl.h
similarity index 100%
rename from mtapi_opencl_c/src/CL/opencl.h
rename to mtapi_plugins_c/mtapi_opencl_c/src/CL/opencl.h
diff --git a/mtapi_opencl_c/src/embb_mtapi_opencl.c b/mtapi_plugins_c/mtapi_opencl_c/src/embb_mtapi_opencl.c
similarity index 100%
rename from mtapi_opencl_c/src/embb_mtapi_opencl.c
rename to mtapi_plugins_c/mtapi_opencl_c/src/embb_mtapi_opencl.c
diff --git a/mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.c b/mtapi_plugins_c/mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.c
similarity index 100%
rename from mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.c
rename to mtapi_plugins_c/mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.c
diff --git a/mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.h b/mtapi_plugins_c/mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.h
similarity index 100%
rename from mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.h
rename to mtapi_plugins_c/mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.h
diff --git a/mtapi_opencl_c/test/embb_mtapi_opencl_test_linker.cc b/mtapi_plugins_c/mtapi_opencl_c/test/embb_mtapi_opencl_test_linker.cc
similarity index 100%
rename from mtapi_opencl_c/test/embb_mtapi_opencl_test_linker.cc
rename to mtapi_plugins_c/mtapi_opencl_c/test/embb_mtapi_opencl_test_linker.cc
diff --git a/mtapi_opencl_c/test/embb_mtapi_opencl_test_linker.h b/mtapi_plugins_c/mtapi_opencl_c/test/embb_mtapi_opencl_test_linker.h
similarity index 100%
rename from mtapi_opencl_c/test/embb_mtapi_opencl_test_linker.h
rename to mtapi_plugins_c/mtapi_opencl_c/test/embb_mtapi_opencl_test_linker.h
diff --git a/mtapi_opencl_c/test/embb_mtapi_opencl_test_task.cc b/mtapi_plugins_c/mtapi_opencl_c/test/embb_mtapi_opencl_test_task.cc
similarity index 100%
rename from mtapi_opencl_c/test/embb_mtapi_opencl_test_task.cc
rename to mtapi_plugins_c/mtapi_opencl_c/test/embb_mtapi_opencl_test_task.cc
diff --git a/mtapi_opencl_c/test/embb_mtapi_opencl_test_task.h b/mtapi_plugins_c/mtapi_opencl_c/test/embb_mtapi_opencl_test_task.h
similarity index 100%
rename from mtapi_opencl_c/test/embb_mtapi_opencl_test_task.h
rename to mtapi_plugins_c/mtapi_opencl_c/test/embb_mtapi_opencl_test_task.h
diff --git a/mtapi_opencl_c/test/main.cc b/mtapi_plugins_c/mtapi_opencl_c/test/main.cc
similarity index 100%
rename from mtapi_opencl_c/test/main.cc
rename to mtapi_plugins_c/mtapi_opencl_c/test/main.cc