diff --git a/src/Makefile_Eina_Cxx.am b/src/Makefile_Eina_Cxx.am
index ffd9111aa2..0f19276030 100644
--- a/src/Makefile_Eina_Cxx.am
+++ b/src/Makefile_Eina_Cxx.am
@@ -1,28 +1,26 @@
 
 ### Library
 
-#lib_LTLIBRARIES += lib/eina/libeina.la
-
 installed_einacxxmainheadersdir = $(includedir)/eina_cxx-@VMAJ@
 dist_installed_einacxxmainheaders_DATA = \
-lib/eina_cxx/Eina.hh
+bindings/eina_cxx/Eina.hh
 
 installed_einacxxheadersdir = $(includedir)/eina_cxx-@VMAJ@/eina_cxx
 dist_installed_einacxxheaders_DATA = \
-lib/eina_cxx/eina_accessor.hh       \
-lib/eina_cxx/eina_clone_allocators.hh       \
-lib/eina_cxx/eina_error.hh     \
-lib/eina_cxx/eina_inarray.hh  \
-lib/eina_cxx/eina_inlist.hh   \
-lib/eina_cxx/eina_iterator.hh \
-lib/eina_cxx/eina_lists_auxiliary.hh \
-lib/eina_cxx/eina_ptrarray.hh \
-lib/eina_cxx/eina_ptrlist.hh \
-lib/eina_cxx/eina_ref.hh \
-lib/eina_cxx/eina_stringshare.hh \
-lib/eina_cxx/eina_thread.hh \
-lib/eina_cxx/eina_type_traits.hh \
-lib/eina_cxx/eina_value.hh
+bindings/eina_cxx/eina_accessor.hh       \
+bindings/eina_cxx/eina_clone_allocators.hh       \
+bindings/eina_cxx/eina_error.hh     \
+bindings/eina_cxx/eina_inarray.hh  \
+bindings/eina_cxx/eina_inlist.hh   \
+bindings/eina_cxx/eina_iterator.hh \
+bindings/eina_cxx/eina_lists_auxiliary.hh \
+bindings/eina_cxx/eina_ptrarray.hh \
+bindings/eina_cxx/eina_ptrlist.hh \
+bindings/eina_cxx/eina_ref.hh \
+bindings/eina_cxx/eina_stringshare.hh \
+bindings/eina_cxx/eina_thread.hh \
+bindings/eina_cxx/eina_type_traits.hh \
+bindings/eina_cxx/eina_value.hh
 
 ### Unit tests
 
@@ -46,8 +44,8 @@ tests/eina_cxx/eina_cxx_test_thread.cc \
 tests/eina_cxx/eina_cxx_test_eina_value.cc
 
 tests_eina_cxx_eina_cxx_suite_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
--I$(top_builddir)/src/lib/eina_cxx \
--I$(top_srcdir)/src/lib/eina_cxx \
+-I$(top_builddir)/src/bindings/eina_cxx \
+-I$(top_srcdir)/src/bindings/eina_cxx \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina_cxx\" \
diff --git a/src/lib/eina_cxx/Eina.hh b/src/bindings/eina_cxx/Eina.hh
similarity index 100%
rename from src/lib/eina_cxx/Eina.hh
rename to src/bindings/eina_cxx/Eina.hh
diff --git a/src/lib/eina_cxx/eina_accessor.hh b/src/bindings/eina_cxx/eina_accessor.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_accessor.hh
rename to src/bindings/eina_cxx/eina_accessor.hh
diff --git a/src/lib/eina_cxx/eina_clone_allocators.hh b/src/bindings/eina_cxx/eina_clone_allocators.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_clone_allocators.hh
rename to src/bindings/eina_cxx/eina_clone_allocators.hh
diff --git a/src/lib/eina_cxx/eina_error.hh b/src/bindings/eina_cxx/eina_error.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_error.hh
rename to src/bindings/eina_cxx/eina_error.hh
diff --git a/src/lib/eina_cxx/eina_inarray.hh b/src/bindings/eina_cxx/eina_inarray.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_inarray.hh
rename to src/bindings/eina_cxx/eina_inarray.hh
diff --git a/src/lib/eina_cxx/eina_inlist.hh b/src/bindings/eina_cxx/eina_inlist.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_inlist.hh
rename to src/bindings/eina_cxx/eina_inlist.hh
diff --git a/src/lib/eina_cxx/eina_iterator.hh b/src/bindings/eina_cxx/eina_iterator.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_iterator.hh
rename to src/bindings/eina_cxx/eina_iterator.hh
diff --git a/src/lib/eina_cxx/eina_lists_auxiliary.hh b/src/bindings/eina_cxx/eina_lists_auxiliary.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_lists_auxiliary.hh
rename to src/bindings/eina_cxx/eina_lists_auxiliary.hh
diff --git a/src/lib/eina_cxx/eina_ptrarray.hh b/src/bindings/eina_cxx/eina_ptrarray.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_ptrarray.hh
rename to src/bindings/eina_cxx/eina_ptrarray.hh
diff --git a/src/lib/eina_cxx/eina_ptrlist.hh b/src/bindings/eina_cxx/eina_ptrlist.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_ptrlist.hh
rename to src/bindings/eina_cxx/eina_ptrlist.hh
diff --git a/src/lib/eina_cxx/eina_ref.hh b/src/bindings/eina_cxx/eina_ref.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_ref.hh
rename to src/bindings/eina_cxx/eina_ref.hh
diff --git a/src/lib/eina_cxx/eina_stringshare.hh b/src/bindings/eina_cxx/eina_stringshare.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_stringshare.hh
rename to src/bindings/eina_cxx/eina_stringshare.hh
diff --git a/src/lib/eina_cxx/eina_thread.hh b/src/bindings/eina_cxx/eina_thread.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_thread.hh
rename to src/bindings/eina_cxx/eina_thread.hh
diff --git a/src/lib/eina_cxx/eina_type_traits.hh b/src/bindings/eina_cxx/eina_type_traits.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_type_traits.hh
rename to src/bindings/eina_cxx/eina_type_traits.hh
diff --git a/src/lib/eina_cxx/eina_value.hh b/src/bindings/eina_cxx/eina_value.hh
similarity index 100%
rename from src/lib/eina_cxx/eina_value.hh
rename to src/bindings/eina_cxx/eina_value.hh