diff --git a/include/isaac/backend/binder.h b/include/isaac/kernels/binder.h
similarity index 100%
rename from include/isaac/backend/binder.h
rename to include/isaac/kernels/binder.h
diff --git a/include/isaac/backend/keywords.h b/include/isaac/kernels/keywords.h
similarity index 100%
rename from include/isaac/backend/keywords.h
rename to include/isaac/kernels/keywords.h
diff --git a/include/isaac/backend/mapped_object.h b/include/isaac/kernels/mapped_object.h
similarity index 99%
rename from include/isaac/backend/mapped_object.h
rename to include/isaac/kernels/mapped_object.h
index d6a535546..a954a8152 100644
--- a/include/isaac/backend/mapped_object.h
+++ b/include/isaac/kernels/mapped_object.h
@@ -4,7 +4,7 @@
 #include <map>
 #include <string>
 #include "isaac/types.h"
-#include "isaac/backend/stream.h"
+#include "isaac/kernels/stream.h"
 #include "isaac/symbolic/expression.h"
 
 namespace isaac
diff --git a/include/isaac/backend/parse.h b/include/isaac/kernels/parse.h
similarity index 98%
rename from include/isaac/backend/parse.h
rename to include/isaac/kernels/parse.h
index c33a094b4..9209d409f 100644
--- a/include/isaac/backend/parse.h
+++ b/include/isaac/kernels/parse.h
@@ -2,8 +2,8 @@
 #define ISAAC_BACKEND_PARSE_H
 
 #include <set>
-#include "isaac/backend/mapped_object.h"
-#include "isaac/backend/binder.h"
+#include "isaac/kernels/mapped_object.h"
+#include "isaac/kernels/binder.h"
 #include "isaac/symbolic/expression.h"
 
 namespace isaac
diff --git a/include/isaac/backend/stream.h b/include/isaac/kernels/stream.h
similarity index 100%
rename from include/isaac/backend/stream.h
rename to include/isaac/kernels/stream.h
diff --git a/include/isaac/backend/templates/axpy.h b/include/isaac/kernels/templates/axpy.h
similarity index 96%
rename from include/isaac/backend/templates/axpy.h
rename to include/isaac/kernels/templates/axpy.h
index e82064ac8..9247bd363 100644
--- a/include/isaac/backend/templates/axpy.h
+++ b/include/isaac/kernels/templates/axpy.h
@@ -1,7 +1,7 @@
 #ifndef ISAAC_BACKEND_TEMPLATES_VAXPY_H
 #define ISAAC_BACKEND_TEMPLATES_VAXPY_H
 
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 
 namespace isaac
 {
diff --git a/include/isaac/backend/templates/base.h b/include/isaac/kernels/templates/base.h
similarity index 99%
rename from include/isaac/backend/templates/base.h
rename to include/isaac/kernels/templates/base.h
index b267b0d60..f968c0a77 100644
--- a/include/isaac/backend/templates/base.h
+++ b/include/isaac/kernels/templates/base.h
@@ -7,8 +7,8 @@
 #include <cmath>
 
 #include "isaac/types.h"
-#include "isaac/backend/parse.h"
-#include "isaac/backend/stream.h"
+#include "isaac/kernels/parse.h"
+#include "isaac/kernels/stream.h"
 #include "isaac/symbolic/expression.h"
 #include "isaac/tools/to_string.hpp"
 namespace isaac
diff --git a/include/isaac/backend/templates/dot.h b/include/isaac/kernels/templates/dot.h
similarity index 97%
rename from include/isaac/backend/templates/dot.h
rename to include/isaac/kernels/templates/dot.h
index 791350efd..f5573b3de 100644
--- a/include/isaac/backend/templates/dot.h
+++ b/include/isaac/kernels/templates/dot.h
@@ -1,7 +1,7 @@
 #ifndef ISAAC_BACKEND_TEMPLATES_DOT_H
 #define ISAAC_BACKEND_TEMPLATES_DOT_H
 
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 
 namespace isaac
 {
diff --git a/include/isaac/backend/templates/gemm.h b/include/isaac/kernels/templates/gemm.h
similarity index 98%
rename from include/isaac/backend/templates/gemm.h
rename to include/isaac/kernels/templates/gemm.h
index 128d242ca..eba1cfb53 100644
--- a/include/isaac/backend/templates/gemm.h
+++ b/include/isaac/kernels/templates/gemm.h
@@ -1,7 +1,7 @@
 #ifndef ISAAC_BACKEND_TEMPLATES_MPRODUCT_H
 #define ISAAC_BACKEND_TEMPLATES_MPRODUCT_H
 
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 #include "isaac/symbolic/expression.h"
 #include "isaac/symbolic/preset.h"
 
diff --git a/include/isaac/backend/templates/gemv.h b/include/isaac/kernels/templates/gemv.h
similarity index 97%
rename from include/isaac/backend/templates/gemv.h
rename to include/isaac/kernels/templates/gemv.h
index 84700fa9f..573e16034 100644
--- a/include/isaac/backend/templates/gemv.h
+++ b/include/isaac/kernels/templates/gemv.h
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "isaac/symbolic/expression.h"
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 
 namespace isaac
 {
diff --git a/include/isaac/backend/templates/ger.h b/include/isaac/kernels/templates/ger.h
similarity index 96%
rename from include/isaac/backend/templates/ger.h
rename to include/isaac/kernels/templates/ger.h
index b53999a59..0e68d82d7 100644
--- a/include/isaac/backend/templates/ger.h
+++ b/include/isaac/kernels/templates/ger.h
@@ -2,7 +2,7 @@
 #define ISAAC_BACKEND_TEMPLATES_MAXPY_H
 
 #include <vector>
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 
 namespace isaac
 {
diff --git a/include/isaac/model/model.h b/include/isaac/model/model.h
index c33830903..786546b07 100644
--- a/include/isaac/model/model.h
+++ b/include/isaac/model/model.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <map>
 
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 #include "isaac/model/predictors/random_forest.h"
 #include "isaac/symbolic/expression.h"
 
diff --git a/lib/backend/binder.cpp b/lib/kernels/binder.cpp
similarity index 95%
rename from lib/backend/binder.cpp
rename to lib/kernels/binder.cpp
index e4b26c750..950f7339a 100644
--- a/lib/backend/binder.cpp
+++ b/lib/kernels/binder.cpp
@@ -1,4 +1,4 @@
-#include "isaac/backend/binder.h"
+#include "isaac/kernels/binder.h"
 
 namespace isaac
 {
diff --git a/lib/backend/keywords.cpp b/lib/kernels/keywords.cpp
similarity index 92%
rename from lib/backend/keywords.cpp
rename to lib/kernels/keywords.cpp
index 1dee03934..348ae4993 100644
--- a/lib/backend/keywords.cpp
+++ b/lib/kernels/keywords.cpp
@@ -1,4 +1,4 @@
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/keywords.h"
 
 namespace isaac
 {
diff --git a/lib/backend/mapped_object.cpp b/lib/kernels/mapped_object.cpp
similarity index 99%
rename from lib/backend/mapped_object.cpp
rename to lib/kernels/mapped_object.cpp
index 31aa8310a..da1fd888a 100644
--- a/lib/backend/mapped_object.cpp
+++ b/lib/kernels/mapped_object.cpp
@@ -3,9 +3,9 @@
 
 #include <iostream>
 
-#include "isaac/backend/mapped_object.h"
-#include "isaac/backend/parse.h"
-#include "isaac/backend/stream.h"
+#include "isaac/kernels/mapped_object.h"
+#include "isaac/kernels/parse.h"
+#include "isaac/kernels/stream.h"
 #include "isaac/symbolic/expression.h"
 #include "isaac/tools/to_string.hpp"
 #include "isaac/tools/find_and_replace.hpp"
diff --git a/lib/backend/parse.cpp b/lib/kernels/parse.cpp
similarity index 99%
rename from lib/backend/parse.cpp
rename to lib/kernels/parse.cpp
index bdb3ab395..97b3ae911 100644
--- a/lib/backend/parse.cpp
+++ b/lib/kernels/parse.cpp
@@ -1,7 +1,7 @@
 #include <cstring>
 
 #include "isaac/array.h"
-#include "isaac/backend/parse.h"
+#include "isaac/kernels/parse.h"
 #include "isaac/exception/operation_not_supported.h"
 
 namespace isaac
diff --git a/lib/backend/stream.cpp b/lib/kernels/stream.cpp
similarity index 95%
rename from lib/backend/stream.cpp
rename to lib/kernels/stream.cpp
index 431528409..4c072a4de 100644
--- a/lib/backend/stream.cpp
+++ b/lib/kernels/stream.cpp
@@ -1,4 +1,4 @@
-#include "isaac/backend/stream.h"
+#include "isaac/kernels/stream.h"
 
 namespace isaac
 {
diff --git a/lib/backend/templates/axpy.cpp b/lib/kernels/templates/axpy.cpp
similarity index 98%
rename from lib/backend/templates/axpy.cpp
rename to lib/kernels/templates/axpy.cpp
index cca72985a..0276518bc 100644
--- a/lib/backend/templates/axpy.cpp
+++ b/lib/kernels/templates/axpy.cpp
@@ -1,7 +1,7 @@
 #include <cstring>
 #include <algorithm>
-#include "isaac/backend/templates/axpy.h"
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/templates/axpy.h"
+#include "isaac/kernels/keywords.h"
 #include "isaac/driver/backend.h"
 #include "isaac/tools/make_map.hpp"
 #include "isaac/tools/make_vector.hpp"
diff --git a/lib/backend/templates/base.cpp b/lib/kernels/templates/base.cpp
similarity index 98%
rename from lib/backend/templates/base.cpp
rename to lib/kernels/templates/base.cpp
index 1648ba2dd..7b843af02 100644
--- a/lib/backend/templates/base.cpp
+++ b/lib/kernels/templates/base.cpp
@@ -2,14 +2,14 @@
 #include <algorithm>
 
 #include "isaac/array.h"
-#include "isaac/backend/keywords.h"
-#include "isaac/backend/templates/axpy.h"
-#include "isaac/backend/templates/dot.h"
-#include "isaac/backend/templates/ger.h"
-#include "isaac/backend/templates/gemv.h"
-#include "isaac/backend/templates/gemm.h"
-#include "isaac/backend/templates/base.h"
-#include "isaac/backend/parse.h"
+#include "isaac/kernels/keywords.h"
+#include "isaac/kernels/templates/axpy.h"
+#include "isaac/kernels/templates/dot.h"
+#include "isaac/kernels/templates/ger.h"
+#include "isaac/kernels/templates/gemv.h"
+#include "isaac/kernels/templates/gemm.h"
+#include "isaac/kernels/templates/base.h"
+#include "isaac/kernels/parse.h"
 #include "isaac/exception/operation_not_supported.h"
 #include "isaac/exception/unknown_datatype.h"
 #include "isaac/tools/to_string.hpp"
diff --git a/lib/backend/templates/dot.cpp b/lib/kernels/templates/dot.cpp
similarity index 99%
rename from lib/backend/templates/dot.cpp
rename to lib/kernels/templates/dot.cpp
index bef54892b..3ebcccbd6 100644
--- a/lib/backend/templates/dot.cpp
+++ b/lib/kernels/templates/dot.cpp
@@ -1,10 +1,10 @@
 #include <cstring>
 #include <iostream>
-#include "isaac/backend/templates/dot.h"
+#include "isaac/kernels/templates/dot.h"
 #include "isaac/tools/to_string.hpp"
 #include "isaac/tools/make_map.hpp"
 #include "isaac/tools/make_vector.hpp"
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/keywords.h"
 namespace isaac
 {
 namespace templates
diff --git a/lib/backend/templates/gemm.cpp b/lib/kernels/templates/gemm.cpp
similarity index 99%
rename from lib/backend/templates/gemm.cpp
rename to lib/kernels/templates/gemm.cpp
index 2021f7b91..864833d9d 100644
--- a/lib/backend/templates/gemm.cpp
+++ b/lib/kernels/templates/gemm.cpp
@@ -1,6 +1,6 @@
 #include "isaac/array.h"
-#include "isaac/backend/templates/gemm.h"
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/templates/gemm.h"
+#include "isaac/kernels/keywords.h"
 #include "isaac/model/model.h"
 #include "isaac/symbolic/preset.h"
 #include "isaac/exception/operation_not_supported.h"
diff --git a/lib/backend/templates/gemv.cpp b/lib/kernels/templates/gemv.cpp
similarity index 99%
rename from lib/backend/templates/gemv.cpp
rename to lib/kernels/templates/gemv.cpp
index 81fcb2455..bf2226893 100644
--- a/lib/backend/templates/gemv.cpp
+++ b/lib/kernels/templates/gemv.cpp
@@ -1,8 +1,8 @@
 #include <cstring>
 #include <iostream>
-#include "isaac/backend/stream.h"
-#include "isaac/backend/keywords.h"
-#include "isaac/backend/templates/gemv.h"
+#include "isaac/kernels/stream.h"
+#include "isaac/kernels/keywords.h"
+#include "isaac/kernels/templates/gemv.h"
 #include "isaac/tools/to_string.hpp"
 #include "isaac/tools/make_map.hpp"
 #include "isaac/tools/make_vector.hpp"
diff --git a/lib/backend/templates/ger.cpp b/lib/kernels/templates/ger.cpp
similarity index 98%
rename from lib/backend/templates/ger.cpp
rename to lib/kernels/templates/ger.cpp
index 6e454c72b..8f33c4ff1 100644
--- a/lib/backend/templates/ger.cpp
+++ b/lib/kernels/templates/ger.cpp
@@ -1,10 +1,10 @@
 #include <cstring>
 #include <iostream>
-#include "isaac/backend/templates/ger.h"
+#include "isaac/kernels/templates/ger.h"
 #include "isaac/tools/make_map.hpp"
 #include "isaac/tools/make_vector.hpp"
 #include "isaac/symbolic/io.h"
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/keywords.h"
 
 namespace isaac
 {
diff --git a/lib/model/model.cpp b/lib/model/model.cpp
index 325c930a6..c1340670c 100644
--- a/lib/model/model.cpp
+++ b/lib/model/model.cpp
@@ -6,12 +6,12 @@
 #include <memory>
 
 #include "rapidjson/document.h"
-#include "isaac/backend/parse.h"
-#include "isaac/backend/templates/axpy.h"
-#include "isaac/backend/templates/dot.h"
-#include "isaac/backend/templates/ger.h"
-#include "isaac/backend/templates/gemv.h"
-#include "isaac/backend/templates/gemm.h"
+#include "isaac/kernels/parse.h"
+#include "isaac/kernels/templates/axpy.h"
+#include "isaac/kernels/templates/dot.h"
+#include "isaac/kernels/templates/ger.h"
+#include "isaac/kernels/templates/gemv.h"
+#include "isaac/kernels/templates/gemm.h"
 #include "isaac/driver/program_cache.h"
 #include "isaac/exception/unknown_datatype.h"
 #include "isaac/exception/operation_not_supported.h"
diff --git a/python/setup.py b/python/setup.py
index 1e176655a..673e63502 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -115,7 +115,7 @@ def main():
     include =' src/include'.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")]
 
     #Source files
-    src =  'src/lib/array.cpp src/lib/value_scalar.cpp src/lib/wrap/clBLAS.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/io.cpp src/lib/symbolic/execute.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/program.cpp src/lib/driver/context.cpp src/lib/driver/platform.cpp src/lib/driver/device.cpp src/lib/driver/program_cache.cpp src/lib/driver/kernel.cpp src/lib/driver/event.cpp src/lib/driver/check.cpp src/lib/driver/backend.cpp src/lib/driver/ndrange.cpp src/lib/driver/command_queue.cpp src/lib/driver/buffer.cpp src/lib/driver/handle.cpp src/lib/backend/parse.cpp src/lib/backend/stream.cpp src/lib/backend/mapped_object.cpp src/lib/backend/keywords.cpp src/lib/backend/binder.cpp src/lib/backend/templates/gemm.cpp src/lib/backend/templates/gemv.cpp src/lib/backend/templates/dot.cpp src/lib/backend/templates/ger.cpp src/lib/backend/templates/axpy.cpp src/lib/backend/templates/base.cpp '.split() + [os.path.join('src', 'wrap', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
+    src =  'src/lib/symbolic/preset.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/array.cpp src/lib/value_scalar.cpp src/lib/driver/backend.cpp src/lib/driver/device.cpp src/lib/driver/kernel.cpp src/lib/driver/buffer.cpp src/lib/driver/platform.cpp src/lib/driver/check.cpp src/lib/driver/program.cpp src/lib/driver/command_queue.cpp src/lib/driver/program_cache.cpp src/lib/driver/context.cpp src/lib/driver/event.cpp src/lib/driver/ndrange.cpp src/lib/driver/handle.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/stream.cpp src/lib/kernels/parse.cpp src/lib/kernels/keywords.cpp src/lib/kernels/binder.cpp src/lib/wrap/clBLAS.cpp '.split() + [os.path.join('src', 'wrap', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
     boostsrc = 'external/boost/libs/'
     for s in ['numpy','python','smart_ptr','system','thread']:
         src = src + [x for x in recursive_glob('external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x]
diff --git a/python/src/wrap/model.cpp b/python/src/wrap/model.cpp
index 1c22dd0f6..da625ba0a 100644
--- a/python/src/wrap/model.cpp
+++ b/python/src/wrap/model.cpp
@@ -1,8 +1,8 @@
-#include "isaac/backend/templates/axpy.h"
-#include "isaac/backend/templates/ger.h"
-#include "isaac/backend/templates/dot.h"
-#include "isaac/backend/templates/gemv.h"
-#include "isaac/backend/templates/gemm.h"
+#include "isaac/kernels/templates/axpy.h"
+#include "isaac/kernels/templates/ger.h"
+#include "isaac/kernels/templates/dot.h"
+#include "isaac/kernels/templates/gemv.h"
+#include "isaac/kernels/templates/gemm.h"
 #include "isaac/model/model.h"
 
 #include "common.hpp"