diff --git a/ChangeLog.eina b/ChangeLog.eina
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Makefile.am b/Makefile.am
index 5da702b397..6521c6759b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,14 +22,21 @@ m4/ltversion.m4
 
 EXTRA_DIST =  \
 m4/efl_attribute.m4 \
+m4/efl_check_funcs.m4 \
 m4/efl_compiler.m4 \
 m4/efl_doxygen.m4 \
+m4/efl_path_max.m4 \
+m4/efl_threads.m4 \
 m4/evil_windows.m4
 
 if HAVE_WINDOWS
 EXTRA_DIST += evil.pc
 endif
 
+EXTRA_DIST += \
+eina.spec \
+eina.pc
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
 
@@ -37,6 +44,8 @@ if HAVE_WINDOWS
 pkgconfig_DATA += evil.pc
 endif
 
+pkgconfig_DATA += eina.pc
+
 
 .PHONY: doc
 
@@ -45,3 +54,32 @@ endif
 doc:
 	@echo "entering doc/"
 	make -C doc doc
+
+if EFL_ENABLE_COVERAGE
+
+lcov-reset:
+	@rm -rf $(top_builddir)/coverage
+	@find $(top_builddir) -name "*.gcda" -delete
+	@lcov --zerocounters --directory $(top_builddir)
+
+lcov-report:
+	@mkdir $(top_builddir)/coverage
+	lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)
+	lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info
+	genhtml -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned.info
+	@echo "Coverage Report at $(top_builddir)/coverage/html"
+
+endif
+
+if EFL_ENABLE_TESTS
+
+check-local:
+if EFL_ENABLE_COVERAGE
+	@$(MAKE) lcov-reset
+endif
+	@./src/tests/eina_suite
+if EFL_ENABLE_COVERAGE
+	@$(MAKE) lcov-report
+endif
+
+endif
diff --git a/legacy/eina/NEWS b/NEWS.eina
similarity index 100%
rename from legacy/eina/NEWS
rename to NEWS.eina
diff --git a/legacy/eina/README b/README.eina
similarity index 100%
rename from legacy/eina/README
rename to README.eina
diff --git a/configure.ac b/configure.ac
index fee52f4e86..e0e21f995f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,14 +141,25 @@ case "$host_os" in
       want_eeze="no"
       want_emotion="no"
       want_ethumb="no"
+      MODULE_ARCH="$host_os-$host_cpu"
+      MODULE_EXT=".dll"
    ;;
    mingw*)
       have_win32="yes"
       have_windows="yes"
       want_eeze="no"
+      MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
+      MODULE_EXT=".dll"
+   ;;
+   *)
+      MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
+      MODULE_EXT=".so"
    ;;
 esac
 
+AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
+AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
+
 AM_CONDITIONAL([HAVE_WINCE], [test "x${have_wince}" = "xyes"])
 AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])
 AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
@@ -187,6 +198,14 @@ if test "x${PKG_CONFIG}" = "x" ; then
    AC_MSG_ERROR([pkg-config tool not found. Install it or set PKG_CONFIG environment variable to that path tool. Exiting...])
 fi
 
+# Check whether pkg-config supports Requires.private
+if ${PKG_CONFIG} --atleast-pkgconfig-version 0.22 ; then
+   pkgconfig_requires_private="Requires.private"
+else
+   pkgconfig_requires_private="Requires"
+fi
+AC_SUBST([pkgconfig_requires_private])
+
 # doxygen program for documentation building
 
 EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
@@ -231,6 +250,8 @@ AC_SUBST([lt_enable_auto_import])
 
 if test "x${have_windows}" = "xyes" ; then
 
+AC_MSG_NOTICE([Evil checks])
+
 ### Default values
 
 ### Additional options to configure
@@ -253,9 +274,12 @@ case "$host_os" in
     ;;
 esac
 requirements_libs_evil="${EVIL_LIBS}"
+
 AC_SUBST([EVIL_LIBS])
 AC_SUBST([EVIL_DLFCN_LIBS])
 
+AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
+
 ### Checks for header files
 
 AC_CHECK_HEADERS([errno.h])
@@ -292,6 +316,433 @@ fi
 
 #### Eina
 
+AC_MSG_NOTICE([Eina checks])
+
+### Default values
+
+### Additional options to configure
+
+# Magic debug
+AC_ARG_ENABLE([magic-debug],
+   [AC_HELP_STRING([--disable-magic-debug], [disable magic debug of eina structure @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_magic_debug="yes"
+    else
+       have_magic_debug="no"
+    fi
+   ],
+   [have_magic_debug="yes"])
+
+AC_MSG_CHECKING([whether magic debug is enable])
+AC_MSG_RESULT([${have_magic_debug}])
+
+if test "x${have_magic_debug}" = "xyes" ; then
+   EINA_CONFIGURE_MAGIC_DEBUG="#define EINA_MAGIC_DEBUG"
+fi
+AC_SUBST([EINA_CONFIGURE_MAGIC_DEBUG])
+
+# Safety checks (avoid crashes on wrong api usage)
+AC_ARG_ENABLE([safety-checks],
+   [AC_HELP_STRING([--disable-safety-checks], [disable safety checks for NULL pointers and like. @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       have_safety_checks="yes"
+    else
+       have_safety_checks="no"
+    fi
+   ],
+   [have_safety_checks="yes"])
+
+AC_MSG_CHECKING([whether to do safety checking on api parameters])
+AC_MSG_RESULT([${have_safety_checks}])
+
+if test "x${have_safety_checks}" = "xyes" ; then
+   AC_DEFINE([EINA_SAFETY_CHECKS], [1], [disable safety checks for NULL pointers and like.])
+   EINA_CONFIGURE_SAFETY_CHECKS="#define EINA_SAFETY_CHECKS"
+fi
+AC_SUBST([EINA_CONFIGURE_SAFETY_CHECKS])
+
+AM_CONDITIONAL([SAFETY_CHECKS], [test "x$have_safety_checks" = "xyes"])
+
+# Miximum log level
+with_max_log_level="<unset>"
+AC_ARG_WITH([internal-maximum-log-level],
+   [AC_HELP_STRING([--with-internal-maximum-log-level=NUMBER],
+                   [limit eina internal log level to the given number, any call to EINA_LOG() with values greater than this will be compiled out, ignoring runtime settings, but saving function calls.])],
+   [
+    if test "x${withval}" != "xno" ; then
+       if echo "${withval}" | grep -E '^[[0-9]]+$' >/dev/null 2>/dev/null; then
+          AC_MSG_NOTICE([ignoring any EINA_LOG() with level greater than ${withval}])
+          AC_DEFINE_UNQUOTED([EINA_LOG_LEVEL_MAXIMUM], [${withval}], [if set, logging is limited to this amount.])
+          with_max_log_level="${withval}"
+       else
+          AC_MSG_ERROR([--with-internal-maximum-log-level takes a decimal number, got "${withval}" instead.])
+       fi
+    fi
+    ],
+    [:])
+
+# Choose best memory pool
+AC_ARG_ENABLE([default-mempool],
+   [AC_HELP_STRING([--enable-default-mempool], [Default memory allocator could be faster for some computer. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes"; then
+       have_default_mempool="yes"
+    else
+       have_default_mempool="no"
+    fi
+   ],
+   [have_default_mempool="no"])
+
+AC_MSG_CHECKING([whether to use default mempool allocator])
+AC_MSG_RESULT([${have_default_mempool}])
+
+if test "x${have_default_mempool}" = "xyes" ; then
+   EINA_CONFIGURE_DEFAULT_MEMPOOL="#define EINA_DEFAULT_MEMPOOL"
+fi
+AC_SUBST([EINA_CONFIGURE_DEFAULT_MEMPOOL])
+
+# Report stringshare usage
+AC_ARG_ENABLE([stringshare-usage],
+   [AC_HELP_STRING([--enable-stringshare-usage], [Report stringshare usage on stringshare shutdown. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes"; then
+       have_stringshare_usage="yes"
+    else
+       have_stringshare_usage="no"
+    fi
+   ],
+   [have_stringshare_usage="no"]
+)
+AC_MSG_CHECKING([whether to report stringshare usage])
+AC_MSG_RESULT([${have_stringshare_usage}])
+
+if test "x${have_stringshare_usage}" = "xyes"; then
+   AC_DEFINE([EINA_STRINGSHARE_USAGE], [1], [Report Eina stringshare usage pattern])
+fi
+
+# Assert or fail.
+
+AC_ARG_ENABLE([assert],
+   [AC_HELP_STRING([--enable-assert], [enable assert, @<:@default=no@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       prefer_assert="yes"
+    else
+       prefer_assert="no"
+    fi
+   ],
+   [prefer_assert="no"])
+
+# Check if we want to benchmark on real data
+AC_ARG_ENABLE([e17],
+   [AC_HELP_STRING([--enable-e17], [enable heavy benchmark @<:@default=no@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       enable_benchmark_e17="yes"
+    else
+       enable_benchmark_e17="no"
+    fi
+   ],
+   [enable_benchmark_e17="no"])
+
+AC_MSG_CHECKING([whether e17 real data benchmark are built])
+AC_MSG_RESULT([${enable_benchmark_e17}])
+
+AM_CONDITIONAL([EINA_ENABLE_BENCHMARK_E17], [test "x${enable_benchmark_e17}" = "xyes"])
+
+### Checks for programs
+
+### Checks for libraries
+
+## Compatibility layers
+
+# Evil library for compilation on Windows
+
+EFL_EINA_BUILD=""
+case "$host_os" in
+   mingw*)
+      PKG_CHECK_EXISTS([evil >= 1.6.99])
+      AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
+      requirements_pc_eina="${requirements_pc_eina} evil"
+      EFL_EINA_BUILD="-DEFL_EINA_BUILD"
+   ;;
+esac
+AC_SUBST([EFL_EINA_BUILD])
+
+# Escape library for compilation on Playstation 3
+
+case "$host_vendor" in
+  ps3*)
+      PKG_CHECK_EXISTS([escape])
+      AC_DEFINE([HAVE_ESCAPE], [1], [Set to 1 if Escape package is installed])
+      requirements_pc_eina="${requirements_pc_eina} escape"
+    ;;
+esac
+
+# Exotic library for copilation on Coyote
+
+PKG_CHECK_EXISTS([exotic],
+   [
+    enable_exotic="yes"
+    AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
+    EINA_CONFIGURE_HAVE_EXOTIC="#define EINA_HAVE_EXOTIC"
+    requirements_pc_eina="exotic ${requirements_pc_eina}"
+   ],
+   [enable_exotic="no"])
+
+AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
+AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC])
+
+if ! test "x${requirements_pc_eina}" = "x" ; then
+   PKG_CHECK_MODULES([EINA], [${requirements_pc_eina}])
+fi
+
+## Options
+
+# Valgrind
+
+AC_ARG_ENABLE([valgrind],
+   [AC_HELP_STRING([--enable-valgrind], [improve valgrind support by hinting it of our memory usages, having it to report proper mempool leaks.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_valgrind="yes"
+    else
+       want_valgrind="no"
+    fi
+   ],
+   [want_valgrind="auto"])
+
+AC_MSG_CHECKING([whether to enable build with valgrind])
+AC_MSG_RESULT([${want_valgrind}])
+
+if test "x${want_valgrind}" = "xyes" || test "x${want_valgrind}" = "xauto"; then
+   PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0],
+      [
+       have_valgrind="yes"
+       requirements_pc_eina="valgrind ${requirements_pc_eina}"
+      ],
+      [
+       have_valgrind="no"
+       AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled])
+       if test "x${want_valgrind}" = "xyes"; then
+          AC_MSG_ERROR([Valgrind >= 2.4.0 is required])
+       fi
+      ])
+else
+    AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled])
+fi
+
+AC_ARG_ENABLE([debug-malloc],
+   [AC_HELP_STRING([--enable-debug-malloc], [enable debugging of malloc usage overhead in our allocator @<:@default=enabled@:>@])],
+   [
+     if test "x${enableval}" = "xyes" ; then
+     	want_debug_malloc="yes"
+     else
+	want_debug_malloc="no"
+     fi
+   ],
+   [want_debug_malloc="no"])
+
+if test "x${ac_cv_func_malloc_usable_size}" = "xyes" && test "x${want_debug_malloc}" = "xyes"; then
+   AC_DEFINE([EINA_DEBUG_MALLOC], [1], [Turn on debugging overhead in mempool])
+fi
+
+AC_ARG_ENABLE([log],
+   [AC_HELP_STRING([--disable-log], [disable Eina_Log infrastructure completly @<:@default=enabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_log="yes"
+    else
+       want_log="no"
+    fi
+   ],
+   [want_log="yes"])
+
+## Modules
+
+# Check ememoa memory pool library
+
+AC_ARG_ENABLE([ememoa],
+   [AC_HELP_STRING([--enable-ememoa], [build ememoa memory pool module @<:@default=yes@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       enable_ememoa="yes"
+    else
+       enable_ememoa="no"
+    fi
+   ],
+   [enable_ememoa="yes"])
+
+AC_MSG_CHECKING([whether to use ememoa for memory pool])
+AC_MSG_RESULT([${enable_ememoa}])
+
+if test "x${enable_ememoa}" = "xyes" ; then
+   PKG_CHECK_MODULES([EMEMOA],
+      [ememoa >= 0.0.26 ],
+      [enable_ememoa="yes"],
+      [enable_ememoa="no"])
+fi
+
+## Examples
+
+PKG_CHECK_MODULES([ECORE_EVAS],
+   [ecore-evas ecore evas],
+   [build_tiler_example="yes"],
+   [build_tiler_example="no"])
+
+AM_CONDITIONAL([BUILD_TILER_EXAMPLE], [test "x${build_tiler_example}" = "xyes"])
+
+## Tests
+
+EFL_CHECK_TESTS(EINA)
+
+### Checks for header files
+
+AC_HEADER_ASSERT
+AC_HEADER_TIME
+AC_HEADER_DIRENT
+
+AC_CHECK_HEADERS([unistd.h libgen.h inttypes.h stdint.h sys/types.h siginfo.h strings.h execinfo.h mcheck.h])
+
+# sys/mman.h could be provided by evil/escape/exotic so we need to set CFLAGS accordingly
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${CFLAGS} ${EINA_CFLAGS}"
+AC_CHECK_HEADERS([sys/mman.h])
+CFLAGS="${CFLAGS_save}"
+
+if test "x${ac_cv_header_inttypes_h}" = "xyes" ; then
+   EINA_CONFIGURE_HAVE_INTTYPES_H="#define EINA_HAVE_INTTYPES_H"
+   AC_DEFINE([HAVE_INTTYPES_H], [1], [Define to 1 if you have the <inttypes.h> header file.])
+fi
+AC_SUBST([EINA_CONFIGURE_HAVE_INTTYPES_H])
+
+if test "x${ac_cv_header_inttypes_h}" = "xyes" ; then
+    EINA_CONFIGURE_HAVE_STDINT_H="#define EINA_HAVE_STDINT_H"
+    AC_DEFINE([HAVE_STDINT_H], [1], [Define to 1 if you have the <stdint.h> header file.])
+fi
+AC_SUBST([EINA_CONFIGURE_HAVE_STDINT_H])
+
+### Checks for types
+
+# wchar_t
+
+AC_CHECK_SIZEOF([wchar_t])
+EINA_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t
+AC_SUBST([EINA_SIZEOF_WCHAR_T])
+AC_CHECK_TYPES([siginfo_t], [], [],
+   [[
+#include <signal.h>
+#if HAVE_SIGINFO_H
+# include <siginfo.h>
+#endif
+   ]])
+
+# struct dirent
+
+AC_CHECK_TYPES([struct dirent], [have_dirent="yes"], [have_dirent="no"],
+   [[
+#include <dirent.h>
+   ]])
+
+if test "x${have_dirent}" = "xyes" ; then
+    EINA_CONFIGURE_HAVE_DIRENT_H="#define EINA_HAVE_DIRENT_H"
+    AC_DEFINE([HAVE_DIRENT_H], [1], [Define to 1 if you have a valid <dirent.h> header file.])
+fi
+AC_SUBST([EINA_CONFIGURE_HAVE_DIRENT_H])
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+AC_C_BIGENDIAN
+AC_C_INLINE
+EFL_ATTRIBUTE_UNUSED
+
+m4_ifdef([v_ver],
+   [
+    EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra])
+   ])
+
+EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow])
+
+EFL_CHECK_PATH_MAX
+
+### Checks for linker characteristics
+
+EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing])
+
+### Checks for library functions
+
+AC_FUNC_ALLOCA
+
+AC_CHECK_FUNCS([strlcpy openat fstatat fpathconf execvp backtrace backtrace_symbols malloc_usable_size mtrace])
+
+EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr fnmatch iconv shm_open setxattr])
+
+enable_log="no"
+if test "x${efl_func_fnmatch}" = "xyes" && test "x${want_log}" = "xyes" ; then
+   enable_log="yes"
+fi
+
+AC_MSG_CHECKING([wether to build Eina_Log infrastructure])
+AC_MSG_RESULT([${enable_log}])
+
+if test "x${enable_log}" = "xyes"; then
+    EINA_CONFIGURE_ENABLE_LOG="#define EINA_ENABLE_LOG"
+    AC_DEFINE([HAVE_LOG], [1], [Define to 1 if we log support is on])
+fi
+AC_SUBST([EINA_CONFIGURE_ENABLE_LOG])
+
+EFL_CHECK_THREADS
+
+if ! test "x${efl_have_threads}" = "xno" ; then
+   EINA_CONFIGURE_HAVE_THREADS="#define EINA_HAVE_THREADS"
+fi
+AC_SUBST(EINA_CONFIGURE_HAVE_THREADS)
+AM_CONDITIONAL([EINA_HAVE_THREADS], [! test "x${efl_have_threads}" = "xno"])
+
+if test "x${efl_have_debug_threads}" = "xyes"; then
+   EINA_CONFIGURE_HAVE_DEBUG_THREADS="#define EINA_HAVE_DEBUG_THREADS"
+fi
+AC_SUBST(EINA_CONFIGURE_HAVE_DEBUG_THREADS)
+AM_CONDITIONAL([EINA_DEBUG_THREADS], [test "x${efl_have_debug_threads}" = "xyes"])
+
+if ! test "x${efl_have_on_off_threads}" = "xno"; then
+   EINA_CONFIGURE_HAVE_ON_OFF_THREADS="#define EINA_HAVE_ON_OFF_THREADS"
+fi
+AC_SUBST(EINA_CONFIGURE_HAVE_ON_OFF_THREADS)
+AM_CONDITIONAL([EINA_ON_OFF_THREADS], [! test "x${efl_have_on_off_threads}" = "xno"])
+
+### Modules
+
+if test "x${have_default_mempool}" = "xyes" ; then
+   enable_chained_pool="no"
+   enable_pass_through="static"
+else
+   enable_chained_pool="static"
+   enable_pass_through="no"
+fi
+
+enable_one_big="static"
+
+EINA_CHECK_MODULE([chained-pool],   [${enable_chained_pool}], [chained pool])
+EINA_CHECK_MODULE([ememoa-fixed],   [${enable_ememoa}],       [ememoa fixed])
+EINA_CHECK_MODULE([ememoa-unknown], [${enable_ememoa}],       [ememoa unknown])
+EINA_CHECK_MODULE([fixed-bitmap],   [no],                     [fixed bitmap])
+EINA_CHECK_MODULE([pass-through],   [${enable_pass_through}], [pass through])
+EINA_CHECK_MODULE([buddy],          [no],                     [buddy])
+EINA_CHECK_MODULE([one-big],        [${enable_one_big}],      [one big])
+
+
+#### End of Eina
+
+
+#### Eet
+
+#AC_MSG_NOTICE([Eet checks])
+
 ### Default values
 ### Additional options to configure
 ### Checks for programs
@@ -303,19 +754,34 @@ fi
 ### Checks for linker characteristics
 ### Checks for library functions
 
-#### End of Eina
-
-#EFL_CHECK_LIBS([eina], [iconv], [have_eina="yes"], [have_eina="no"])
-#EFL_CHECK_LIBS([eet], [zlib libjpeg], [have_eet="yes"], [have_eet="no"])
+#### End of Eet
 
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/bin/Makefile
 src/bin/evil/Makefile
+src/include/Makefile
+src/include/eina/Makefile
+src/include/eina/eina_config.h
 src/lib/Makefile
 src/lib/evil/Makefile
+src/lib/eina/Makefile
+src/modules/Makefile
+src/modules/eina/Makefile
+src/modules/eina/mp/Makefile
+src/modules/eina/mp/chained_pool/Makefile
+src/modules/eina/mp/ememoa_fixed/Makefile
+src/modules/eina/mp/ememoa_unknown/Makefile
+src/modules/eina/mp/pass_through/Makefile
+src/modules/eina/mp/fixed_bitmap/Makefile
+src/modules/eina/mp/buddy/Makefile
+src/modules/eina/mp/one_big/Makefile
+src/scripts/Makefile
+src/scripts/eina/Makefile
+eina.spec
 evil.pc
+eina.pc
 ])
 
 AC_OUTPUT
@@ -339,6 +805,45 @@ fi
 echo
 echo "  Documentation........: ${build_doc}"
 echo
+echo "Eina"
+echo
+echo "  Magic debug..........: ${have_magic_debug}"
+echo "  Safety checks........: ${have_safety_checks}"
+echo "  Maximum log level....: ${with_max_log_level}"
+echo "  Report string usage..: ${have_stringshare_usage}"
+echo "  Valgrind support.....: ${have_valgrind}"
+echo "  Default mempool......: ${have_default_mempool}"
+echo "  Log support..........: ${enable_log}"
+echo "  Thread Support.......: ${efl_have_threads}"
+if test "${efl_have_threads}" = "POSIX" ; then
+echo "    spinlock...........: ${efl_have_posix_threads_spinlock}"
+echo "    debug usage........: ${efl_have_debug_threads}"
+echo "    on/off support.....: ${efl_have_on_off_threads}"
+fi
+echo "  Iconv support........: ${efl_func_iconv}"
+echo "  File dirfd...........: ${efl_func_dirfd}"
+echo "  File xattr...........: ${efl_func_setxattr}"
+echo "  shm_open.............: ${efl_func_shm_open}"
+echo
+echo "  Tests................: ${_efl_enable_tests} (Coverage: ${_efl_enable_coverage})"
+echo "  Examples.............: ${enable_build_examples}"
+echo "  Tiler Example........: ${build_tiler_example}"
+echo "  Examples installed...: ${enable_install_examples}"
+echo "  Benchmark............: ${enable_benchmark}"
+if test "x${enable_benchmark}" = "xyes" ; then
+echo "    Glib...............: ${enable_benchmark_glib}"
+echo "    E17 real data......: ${enable_benchmark_e17}"
+fi
+echo
+echo "  Memory pools:"
+echo "    Buddy..............: ${enable_buddy}"
+echo "    Chained pool.......: ${enable_chained_pool}"
+echo "    Ememoa fixed.......: ${enable_ememoa_fixed}"
+echo "    Ememoa unknown.....: ${enable_ememoa_unknown}"
+echo "    Fixed bitmap.......: ${enable_fixed_bitmap}"
+echo "    One big............: ${enable_one_big}"
+echo "    Pass through.......: ${enable_pass_through}"
+echo
 echo "Compilation............: make (or gmake)"
 echo "  CPPFLAGS.............: $CPPFLAGS"
 echo "  CFLAGS...............: $CFLAGS"
diff --git a/legacy/eina/eina.pc.in b/eina.pc.in
similarity index 100%
rename from legacy/eina/eina.pc.in
rename to eina.pc.in
diff --git a/legacy/eina/eina.spec.in b/eina.spec.in
similarity index 100%
rename from legacy/eina/eina.spec.in
rename to eina.spec.in
diff --git a/legacy/eina/m4/common/efl_check_funcs.m4 b/m4/efl_check_funcs.m4
similarity index 100%
rename from legacy/eina/m4/common/efl_check_funcs.m4
rename to m4/efl_check_funcs.m4
diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4
index 5f17be499d..be6a753e07 100644
--- a/m4/efl_compiler.m4
+++ b/m4/efl_compiler.m4
@@ -54,3 +54,52 @@ AC_DEFUN([EFL_CHECK_COMPILER_FLAGS],
 [
 m4_foreach_w([flag], [$2], [EFL_CHECK_COMPILER_FLAG([$1], m4_defn([flag]))])
 ])
+
+
+dnl Macro that checks for a linker flag availability
+dnl
+dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
+dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value)
+dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
+
+AC_DEFUN([EFL_CHECK_LINKER_FLAG],
+[
+m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z]))
+m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))
+
+LDFLAGS_save="${LDFLAGS}"
+LDFLAGS="${LDFLAGS} $2"
+
+AC_LANG_PUSH([C])
+AC_MSG_CHECKING([whether the linker supports $2])
+
+AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM([[]])],
+   [have_flag="yes"],
+   [have_flag="no"])
+AC_MSG_RESULT([${have_flag}])
+
+LDFLAGS="${LDFLAGS_save}"
+AC_LANG_POP([C])
+
+if test "x${have_flag}" = "xyes" ; then
+   UPEFL[_LIBS]="${UPEFL[_LIBS]} [$2]"
+fi
+AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2])
+AC_SUBST(UPEFL[_LIBS])
+
+AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
+
+m4_popdef([UP])
+m4_popdef([UPEFL])
+])
+
+dnl Macro that iterates over a sequence of white separated flags
+dnl and that call EFL_CHECK_LINKER_FLAG() for each of these flags
+dnl
+dnl EFL_CHECK_LINKER_FLAGS(EFL, FLAGS)
+
+AC_DEFUN([EFL_CHECK_LINKER_FLAGS],
+[
+m4_foreach_w([flag], [$2], [EFL_CHECK_LINKER_FLAG([$1], m4_defn([flag]))])
+])
diff --git a/m4/efl_libraries.m4 b/m4/efl_libraries.m4
deleted file mode 100644
index e7a7009a51..0000000000
--- a/m4/efl_libraries.m4
+++ /dev/null
@@ -1,190 +0,0 @@
-dnl Copyright (C) 2012 Vincent Torri <vincent dot torri at gmail dot com>
-dnl This code is public domain and can be freely used or copied.
-
-dnl Macro that check dependencies libraries for the EFL
-
-dnl _EFL_CHECK_LIB_ICONV is for internal use
-dnl _EFL_CHECK_LIB_ICONV(libname, lib, ACTION-IF-FOUND ,ACTION-IF-NOT-FOUND)
-
-AC_DEFUN([_EFL_CHECK_LIB_ICONV],
-[
-AC_MSG_CHECKING([whether iconv() is in $1])
-
-LIBS_save="${LIBS}"
-LIBS="$2 ${LIBS}"
-AC_LINK_IFELSE([AC_LANG_PROGRAM(
-   [[
-#include <stdlib.h>
-#include <iconv.h>
-   ]],
-   [[
-iconv_t ic;
-size_t count = iconv(ic, NULL, NULL, NULL, NULL);
-   ]])],
-   [
-    have_dep="yes"
-    ICONV_LIBS=$2
-   ],
-   [
-    have_dep="no"
-   ])
-LIBS=${LIBS_save}
-
-AC_MSG_RESULT([${have_dep}])
-
-AS_IF([test "x${have_dep}" = "xyes"], [$3], [$4])
-])
-
-dnl Macro that checks for iconv library in libc, libiconv and libiconv_plug
-dnl
-dnl EFL_CHECK_LIB_ICONV(EFL[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
-dnl update requirements
-
-AC_DEFUN([EFL_CHECK_LIB_ICONV],
-[
-m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
-
-AC_ARG_WITH([iconv-link],
-   AC_HELP_STRING([--with-iconv-link=ICONV_LINK], [explicitly specify an iconv link option]),
-   [
-    have_dep="yes"
-    ICONV_LIBS=${withval}
-   ],
-   [have_dep="no"])
-
-AC_MSG_CHECKING([for explicit iconv link options])
-if test "x${ICONV_LIBS}" = "x" ; then
-   AC_MSG_RESULT([no explicit iconv link option])
-else
-   AC_MSG_RESULT([${ICONV_LIBS}])
-fi
-
-if test "x${have_dep}" = "xno" ; then
-   AC_CHECK_HEADERS([iconv.h], [have_dep="yes"])
-
-   if test "x${have_dep}" = "xyes" ; then
-      _EFL_CHECK_LIB_ICONV([libc], [], [have_dep="yes"], [have_dep="no"])
-   fi
-
-   if test "x${have_dep}" = "xno" ; then
-      _EFL_CHECK_LIB_ICONV([libiconv], [-liconv],
-         [
-          have_dep="yes"
-          m4_defn([DOWN])[]_requirements_libs="$m4_defn([DOWN])[]_requirements_libs -liconv"
-         ],
-         [have_dep="no"])
-   fi
-
-   if test "x${have_dep}" = "xno" ; then
-      _EFL_CHECK_LIB_ICONV([libiconv_plug],  [-liconv_plug],
-         [
-          have_dep="yes"
-          m4_defn([DOWN])[]_requirements_libs="$m4_defn([DOWN])[]_requirements_libs -liconv_plug"
-         ],
-         [have_dep="no"])
-   fi
-fi
-
-AS_IF([test "x${have_dep}" = "xyes"], [$2], [$3])
-
-m4_popdef([DOWN])
-])
-
-dnl Macro that checks for zlib
-dnl
-dnl EFL_CHECK_LIB_ZLIB(EFL[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
-dnl update requirements
-
-AC_DEFUN([EFL_CHECK_LIB_ZLIB],
-[
-m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
-
-PKG_CHECK_MODULES([ZLIB], [zlib],
-   [
-    have_dep="yes"
-    m4_defn([DOWN])[]_requirements_pc="$m4_defn([DOWN])[]_requirements_pc zlib"
-   ],
-   [have_dep="no"])
-
-if test "x${have_dep}" = "xno" ; then
-   AC_CHECK_HEADER([zlib.h], [have_dep="yes"], [have_dep="no"])
-
-   if test "x${have_dep}" = "xyes" ; then
-      AC_CHECK_LIB([z], [zlibVersion],
-         [
-          have_dep="yes"
-          ZLIB_CFLAGS=
-          ZLIB_LIBS="-lz"
-          m4_defn([DOWN])[]_requirements_libs="$m4_defn([DOWN])[]_requirements_libs -lz"
-         ],
-         [have_dep="no"])
-   fi
-fi
-
-AS_IF([test "x${have_dep}" = "xyes"], [$2], [$3])
-
-m4_popdef([DOWN])
-])
-
-dnl Macro that checks for libjpeg
-dnl
-dnl EFL_CHECK_LIB_LIBJPEG(EFL[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
-dnl update requirements
-
-AC_DEFUN([EFL_CHECK_LIB_LIBJPEG],
-[
-m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
-
-AC_CHECK_HEADER([jpeglib.h], [have_dep="yes"], [have_dep="no"])
-
-if test "x${have_dep}" = "xyes" ; then
-   AC_CHECK_LIB([jpeg], [jpeg_std_error],
-      [
-       have_dep="yes"
-       LIBJPEG_CFLAGS=
-       LIBJPEG_LIBS="-ljpeg"
-       m4_defn([DOWN])[]_requirements_libs="$m4_defn([DOWN])[]_requirements_libs -ljpeg"
-      ],
-      [have_dep="no"])
-fi
-
-AS_IF([test "x${have_dep}" = "xyes"], [$2], [$3])
-
-m4_popdef([DOWN])
-])
-
-dnl Macro that checks for a library
-dnl
-dnl EFL_CHECK_LIB(EFL, LIBRARY-FILE[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
-dnl AC_SUBST : EFL_CFLAGS and EFL_LIBS (EFL being replaced by its value)
-dnl AM_CONDITIONAL : EFL_HAVE_EFL (the 2nd EFL being replaced by its value)
-
-AC_DEFUN([EFL_CHECK_LIB],
-[
-m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
-m4_pushdef([UP], m4_translit([$2], [-a-z], [_A-Z]))dnl
-m4_pushdef([DOWN], m4_translit([$2], [-A-Z], [_a-z]))dnl
-
-m4_default([EFL_CHECK_LIB_]m4_defn([UP]))($1, [have_lib="yes"], [have_lib="no"])
-
-AC_ARG_VAR(UP[_CFLAGS], [preprocessor flags for $2])
-AC_SUBST(UP[_CFLAGS])
-AC_ARG_VAR(UP[_LIBS], [linker flags for $2])
-AC_SUBST(UP[_LIBS])
-
-AM_CONDITIONAL([EFL_HAVE_]UPEFL, [test "x${have_lib}" = "xyes"])
-
-m4_popdef([DOWN])
-m4_popdef([UP])
-m4_popdef([UPEFL])
-])
-
-dnl Macro that iterates over a sequence of white separated libraries
-dnl and that call EFL_CHECK_LIB() for each of these libraries
-dnl
-dnl EFL_CHECK_LIBS(EFL, LIBRARY-FILE)
-
-AC_DEFUN([EFL_CHECK_LIBS],
-[
-m4_foreach_w([lib], [$2], [EFL_CHECK_LIB($1, m4_defn([lib]))])
-])
\ No newline at end of file
diff --git a/legacy/ecore/m4/efl_path_max.m4 b/m4/efl_path_max.m4
similarity index 100%
rename from legacy/ecore/m4/efl_path_max.m4
rename to m4/efl_path_max.m4
diff --git a/m4/efl_tests.m4 b/m4/efl_tests.m4
new file mode 100644
index 0000000000..612baa0e8e
--- /dev/null
+++ b/m4/efl_tests.m4
@@ -0,0 +1,49 @@
+dnl Copyright (C) 2008-2012 Vincent Torri <vtorri at univ-evry dot fr>
+dnl That code is public domain and can be freely used or copied.
+
+dnl Macro that check if tests programs are wanted and if yes, if
+dnl the Check library is available.
+dnl the lcov program is available.
+
+dnl Usage: EFL_CHECK_TESTS(EFL[, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Define the automake conditionnal EFL_ENABLE_TESTS
+
+AC_DEFUN([EFL_CHECK_TESTS],
+[
+m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
+
+dnl configure option
+
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+
+PKG_CHECK_MODULES([CHECK],
+   [check >= 0.9.5],
+   [_efl_enable_tests="yes"],
+   [_efl_enable_tests="no"])
+
+AM_CONDITIONAL([EFL_ENABLE_TESTS], [test "x${_efl_enable_tests}" = "xyes"])
+
+_efl_enable_coverage="no"
+AC_CHECK_PROG(have_lcov, [lcov], [yes], [no])
+if test "x$have_lcov" = "xyes" ; then
+   m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -fprofile-arcs -ftest-coverage"
+   m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -lgcov"
+# remove any optimisation flag and force debug symbols
+   if test "x${prefer_assert}" = "xno"; then
+      m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -DNDEBUG"
+   else
+      m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG"
+   fi
+   _efl_enable_coverage="yes"
+else
+   AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
+fi
+
+AM_CONDITIONAL([EFL_ENABLE_COVERAGE], [test "x${_efl_enable_coverage}" = "xyes"])
+
+AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3])
+
+m4_popdef([UPEFL])
+])
+
+dnl End of efl_tests.m4
diff --git a/legacy/eina/m4/common/efl_threads.m4 b/m4/efl_threads.m4
similarity index 100%
rename from legacy/eina/m4/common/efl_threads.m4
rename to m4/efl_threads.m4
diff --git a/legacy/eina/m4/eina/eina_check.m4 b/m4/eina_check.m4
similarity index 97%
rename from legacy/eina/m4/eina/eina_check.m4
rename to m4/eina_check.m4
index f8a4f8c3ae..9f4ffcedc2 100644
--- a/legacy/eina/m4/eina/eina_check.m4
+++ b/m4/eina_check.m4
@@ -4,8 +4,10 @@ AC_DEFUN([EINA_CHECK_MODULE],
 m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
 
+default_value=$2
+
 AC_ARG_ENABLE([mempool-$1],
-   [AC_HELP_STRING([--enable-mempool-$1], [enable build of $3 @<:@default=$2@:>@])],
+   [AC_HELP_STRING([--enable-mempool-$1], [enable build of $3 @<:@default=$@:>@])],
    [
     if test "x${enableval}" = "xyes" ; then
        enable_module="yes"
diff --git a/src/Makefile.am b/src/Makefile.am
index a8590b2f0d..d53263a5cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = lib bin
+SUBDIRS = lib include modules bin scripts
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
new file mode 100644
index 0000000000..b8f642fb72
--- /dev/null
+++ b/src/include/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = eina
diff --git a/legacy/eina/src/include/Eina.h b/src/include/eina/Eina.h
similarity index 100%
rename from legacy/eina/src/include/Eina.h
rename to src/include/eina/Eina.h
diff --git a/src/include/eina/Makefile.am b/src/include/eina/Makefile.am
new file mode 100644
index 0000000000..ef87ce05a6
--- /dev/null
+++ b/src/include/eina/Makefile.am
@@ -0,0 +1,93 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EINAHEADERS = \
+eina_safety_checks.h \
+eina_error.h \
+eina_log.h \
+eina_inline_log.x \
+eina_fp.h \
+eina_inline_f32p32.x \
+eina_inline_f16p16.x \
+eina_inline_f8p24.x \
+eina_inline_fp.x \
+eina_hash.h \
+eina_inline_hash.x \
+eina_lalloc.h \
+eina_clist.h \
+eina_inline_clist.x \
+eina_inarray.h \
+eina_inlist.h \
+eina_list.h \
+eina_file.h \
+eina_mempool.h \
+eina_module.h \
+eina_rectangle.h \
+eina_types.h \
+eina_array.h \
+eina_counter.h \
+eina_inline_array.x \
+eina_magic.h \
+eina_stringshare.h \
+eina_binshare.h \
+eina_binbuf.h \
+eina_ustringshare.h \
+eina_inline_stringshare.x \
+eina_inline_ustringshare.x \
+eina_inline_list.x \
+eina_accessor.h \
+eina_convert.h \
+eina_rbtree.h \
+eina_benchmark.h \
+eina_inline_rbtree.x \
+eina_inline_mempool.x \
+eina_inline_rectangle.x \
+eina_inline_trash.x \
+eina_trash.h \
+eina_iterator.h \
+eina_main.h \
+eina_cpu.h \
+eina_sched.h \
+eina_tiler.h \
+eina_hamster.h \
+eina_matrixsparse.h \
+eina_inline_tiler.x \
+eina_str.h \
+eina_inline_str.x \
+eina_strbuf.h \
+eina_ustrbuf.h \
+eina_unicode.h \
+eina_quadtree.h \
+eina_simple_xml_parser.h \
+eina_lock.h \
+eina_prefix.h \
+eina_refcount.h \
+eina_mmap.h \
+eina_xattr.h \
+eina_value.h \
+eina_inline_value.x
+
+# Will be back for developper after 1.2.
+# eina_model.h
+# eina_object.h
+
+if EINA_HAVE_THREADS
+if HAVE_WINCE
+EINAHEADERS += eina_inline_lock_wince.x
+else
+if HAVE_WIN32
+EINAHEADERS += eina_inline_lock_win32.x
+else
+EINAHEADERS += eina_inline_lock_posix.x
+endif
+endif
+else
+EINAHEADERS += eina_inline_lock_void.x
+endif
+
+installed_mainheaderdir = $(includedir)/eina-@VMAJ@
+dist_installed_mainheader_DATA = Eina.h eina_config.h
+
+installed_headersdir = $(includedir)/eina-@VMAJ@/eina
+dist_installed_headers_DATA = $(EINAHEADERS)
+
+EXTRA_DIST = eina_config.h.in
diff --git a/legacy/eina/src/include/eina_accessor.h b/src/include/eina/eina_accessor.h
similarity index 100%
rename from legacy/eina/src/include/eina_accessor.h
rename to src/include/eina/eina_accessor.h
diff --git a/legacy/eina/src/include/eina_array.h b/src/include/eina/eina_array.h
similarity index 100%
rename from legacy/eina/src/include/eina_array.h
rename to src/include/eina/eina_array.h
diff --git a/legacy/eina/src/include/eina_benchmark.h b/src/include/eina/eina_benchmark.h
similarity index 100%
rename from legacy/eina/src/include/eina_benchmark.h
rename to src/include/eina/eina_benchmark.h
diff --git a/legacy/eina/src/include/eina_binbuf.h b/src/include/eina/eina_binbuf.h
similarity index 100%
rename from legacy/eina/src/include/eina_binbuf.h
rename to src/include/eina/eina_binbuf.h
diff --git a/legacy/eina/src/include/eina_binshare.h b/src/include/eina/eina_binshare.h
similarity index 100%
rename from legacy/eina/src/include/eina_binshare.h
rename to src/include/eina/eina_binshare.h
diff --git a/legacy/eina/src/include/eina_clist.h b/src/include/eina/eina_clist.h
similarity index 100%
rename from legacy/eina/src/include/eina_clist.h
rename to src/include/eina/eina_clist.h
diff --git a/legacy/eina/src/include/eina_config.h.in b/src/include/eina/eina_config.h.in
similarity index 100%
rename from legacy/eina/src/include/eina_config.h.in
rename to src/include/eina/eina_config.h.in
diff --git a/legacy/eina/src/include/eina_convert.h b/src/include/eina/eina_convert.h
similarity index 100%
rename from legacy/eina/src/include/eina_convert.h
rename to src/include/eina/eina_convert.h
diff --git a/legacy/eina/src/include/eina_counter.h b/src/include/eina/eina_counter.h
similarity index 100%
rename from legacy/eina/src/include/eina_counter.h
rename to src/include/eina/eina_counter.h
diff --git a/legacy/eina/src/include/eina_cpu.h b/src/include/eina/eina_cpu.h
similarity index 100%
rename from legacy/eina/src/include/eina_cpu.h
rename to src/include/eina/eina_cpu.h
diff --git a/legacy/eina/src/include/eina_error.h b/src/include/eina/eina_error.h
similarity index 100%
rename from legacy/eina/src/include/eina_error.h
rename to src/include/eina/eina_error.h
diff --git a/legacy/eina/src/include/eina_file.h b/src/include/eina/eina_file.h
similarity index 100%
rename from legacy/eina/src/include/eina_file.h
rename to src/include/eina/eina_file.h
diff --git a/legacy/eina/src/include/eina_fp.h b/src/include/eina/eina_fp.h
similarity index 100%
rename from legacy/eina/src/include/eina_fp.h
rename to src/include/eina/eina_fp.h
diff --git a/legacy/eina/src/include/eina_hamster.h b/src/include/eina/eina_hamster.h
similarity index 100%
rename from legacy/eina/src/include/eina_hamster.h
rename to src/include/eina/eina_hamster.h
diff --git a/legacy/eina/src/include/eina_hash.h b/src/include/eina/eina_hash.h
similarity index 100%
rename from legacy/eina/src/include/eina_hash.h
rename to src/include/eina/eina_hash.h
diff --git a/legacy/eina/src/include/eina_inarray.h b/src/include/eina/eina_inarray.h
similarity index 100%
rename from legacy/eina/src/include/eina_inarray.h
rename to src/include/eina/eina_inarray.h
diff --git a/legacy/eina/src/include/eina_inline_array.x b/src/include/eina/eina_inline_array.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_array.x
rename to src/include/eina/eina_inline_array.x
diff --git a/legacy/eina/src/include/eina_inline_clist.x b/src/include/eina/eina_inline_clist.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_clist.x
rename to src/include/eina/eina_inline_clist.x
diff --git a/legacy/eina/src/include/eina_inline_f16p16.x b/src/include/eina/eina_inline_f16p16.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_f16p16.x
rename to src/include/eina/eina_inline_f16p16.x
diff --git a/legacy/eina/src/include/eina_inline_f32p32.x b/src/include/eina/eina_inline_f32p32.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_f32p32.x
rename to src/include/eina/eina_inline_f32p32.x
diff --git a/legacy/eina/src/include/eina_inline_f8p24.x b/src/include/eina/eina_inline_f8p24.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_f8p24.x
rename to src/include/eina/eina_inline_f8p24.x
diff --git a/legacy/eina/src/include/eina_inline_fp.x b/src/include/eina/eina_inline_fp.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_fp.x
rename to src/include/eina/eina_inline_fp.x
diff --git a/legacy/eina/src/include/eina_inline_hash.x b/src/include/eina/eina_inline_hash.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_hash.x
rename to src/include/eina/eina_inline_hash.x
diff --git a/legacy/eina/src/include/eina_inline_list.x b/src/include/eina/eina_inline_list.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_list.x
rename to src/include/eina/eina_inline_list.x
diff --git a/legacy/eina/src/include/eina_inline_lock_posix.x b/src/include/eina/eina_inline_lock_posix.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_lock_posix.x
rename to src/include/eina/eina_inline_lock_posix.x
diff --git a/legacy/eina/src/include/eina_inline_lock_void.x b/src/include/eina/eina_inline_lock_void.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_lock_void.x
rename to src/include/eina/eina_inline_lock_void.x
diff --git a/legacy/eina/src/include/eina_inline_lock_win32.x b/src/include/eina/eina_inline_lock_win32.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_lock_win32.x
rename to src/include/eina/eina_inline_lock_win32.x
diff --git a/legacy/eina/src/include/eina_inline_lock_wince.x b/src/include/eina/eina_inline_lock_wince.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_lock_wince.x
rename to src/include/eina/eina_inline_lock_wince.x
diff --git a/legacy/eina/src/include/eina_inline_log.x b/src/include/eina/eina_inline_log.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_log.x
rename to src/include/eina/eina_inline_log.x
diff --git a/legacy/eina/src/include/eina_inline_mempool.x b/src/include/eina/eina_inline_mempool.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_mempool.x
rename to src/include/eina/eina_inline_mempool.x
diff --git a/legacy/eina/src/include/eina_inline_rbtree.x b/src/include/eina/eina_inline_rbtree.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_rbtree.x
rename to src/include/eina/eina_inline_rbtree.x
diff --git a/legacy/eina/src/include/eina_inline_rectangle.x b/src/include/eina/eina_inline_rectangle.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_rectangle.x
rename to src/include/eina/eina_inline_rectangle.x
diff --git a/legacy/eina/src/include/eina_inline_str.x b/src/include/eina/eina_inline_str.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_str.x
rename to src/include/eina/eina_inline_str.x
diff --git a/legacy/eina/src/include/eina_inline_stringshare.x b/src/include/eina/eina_inline_stringshare.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_stringshare.x
rename to src/include/eina/eina_inline_stringshare.x
diff --git a/legacy/eina/src/include/eina_inline_tiler.x b/src/include/eina/eina_inline_tiler.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_tiler.x
rename to src/include/eina/eina_inline_tiler.x
diff --git a/legacy/eina/src/include/eina_inline_trash.x b/src/include/eina/eina_inline_trash.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_trash.x
rename to src/include/eina/eina_inline_trash.x
diff --git a/legacy/eina/src/include/eina_inline_ustringshare.x b/src/include/eina/eina_inline_ustringshare.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_ustringshare.x
rename to src/include/eina/eina_inline_ustringshare.x
diff --git a/legacy/eina/src/include/eina_inline_value.x b/src/include/eina/eina_inline_value.x
similarity index 100%
rename from legacy/eina/src/include/eina_inline_value.x
rename to src/include/eina/eina_inline_value.x
diff --git a/legacy/eina/src/include/eina_inlist.h b/src/include/eina/eina_inlist.h
similarity index 100%
rename from legacy/eina/src/include/eina_inlist.h
rename to src/include/eina/eina_inlist.h
diff --git a/legacy/eina/src/include/eina_iterator.h b/src/include/eina/eina_iterator.h
similarity index 100%
rename from legacy/eina/src/include/eina_iterator.h
rename to src/include/eina/eina_iterator.h
diff --git a/legacy/eina/src/include/eina_lalloc.h b/src/include/eina/eina_lalloc.h
similarity index 100%
rename from legacy/eina/src/include/eina_lalloc.h
rename to src/include/eina/eina_lalloc.h
diff --git a/legacy/eina/src/include/eina_list.h b/src/include/eina/eina_list.h
similarity index 100%
rename from legacy/eina/src/include/eina_list.h
rename to src/include/eina/eina_list.h
diff --git a/legacy/eina/src/include/eina_lock.h b/src/include/eina/eina_lock.h
similarity index 100%
rename from legacy/eina/src/include/eina_lock.h
rename to src/include/eina/eina_lock.h
diff --git a/legacy/eina/src/include/eina_log.h b/src/include/eina/eina_log.h
similarity index 100%
rename from legacy/eina/src/include/eina_log.h
rename to src/include/eina/eina_log.h
diff --git a/legacy/eina/src/include/eina_magic.h b/src/include/eina/eina_magic.h
similarity index 100%
rename from legacy/eina/src/include/eina_magic.h
rename to src/include/eina/eina_magic.h
diff --git a/legacy/eina/src/include/eina_main.h b/src/include/eina/eina_main.h
similarity index 100%
rename from legacy/eina/src/include/eina_main.h
rename to src/include/eina/eina_main.h
diff --git a/legacy/eina/src/include/eina_matrixsparse.h b/src/include/eina/eina_matrixsparse.h
similarity index 100%
rename from legacy/eina/src/include/eina_matrixsparse.h
rename to src/include/eina/eina_matrixsparse.h
diff --git a/legacy/eina/src/include/eina_mempool.h b/src/include/eina/eina_mempool.h
similarity index 100%
rename from legacy/eina/src/include/eina_mempool.h
rename to src/include/eina/eina_mempool.h
diff --git a/legacy/eina/src/include/eina_mmap.h b/src/include/eina/eina_mmap.h
similarity index 100%
rename from legacy/eina/src/include/eina_mmap.h
rename to src/include/eina/eina_mmap.h
diff --git a/legacy/eina/src/include/eina_model.h b/src/include/eina/eina_model.h
similarity index 100%
rename from legacy/eina/src/include/eina_model.h
rename to src/include/eina/eina_model.h
diff --git a/legacy/eina/src/include/eina_module.h b/src/include/eina/eina_module.h
similarity index 100%
rename from legacy/eina/src/include/eina_module.h
rename to src/include/eina/eina_module.h
diff --git a/legacy/eina/src/include/eina_object.h b/src/include/eina/eina_object.h
similarity index 100%
rename from legacy/eina/src/include/eina_object.h
rename to src/include/eina/eina_object.h
diff --git a/legacy/eina/src/include/eina_prefix.h b/src/include/eina/eina_prefix.h
similarity index 100%
rename from legacy/eina/src/include/eina_prefix.h
rename to src/include/eina/eina_prefix.h
diff --git a/legacy/eina/src/include/eina_quadtree.h b/src/include/eina/eina_quadtree.h
similarity index 100%
rename from legacy/eina/src/include/eina_quadtree.h
rename to src/include/eina/eina_quadtree.h
diff --git a/legacy/eina/src/include/eina_rbtree.h b/src/include/eina/eina_rbtree.h
similarity index 100%
rename from legacy/eina/src/include/eina_rbtree.h
rename to src/include/eina/eina_rbtree.h
diff --git a/legacy/eina/src/include/eina_rectangle.h b/src/include/eina/eina_rectangle.h
similarity index 100%
rename from legacy/eina/src/include/eina_rectangle.h
rename to src/include/eina/eina_rectangle.h
diff --git a/legacy/eina/src/include/eina_refcount.h b/src/include/eina/eina_refcount.h
similarity index 100%
rename from legacy/eina/src/include/eina_refcount.h
rename to src/include/eina/eina_refcount.h
diff --git a/legacy/eina/src/include/eina_safety_checks.h b/src/include/eina/eina_safety_checks.h
similarity index 100%
rename from legacy/eina/src/include/eina_safety_checks.h
rename to src/include/eina/eina_safety_checks.h
diff --git a/legacy/eina/src/include/eina_sched.h b/src/include/eina/eina_sched.h
similarity index 100%
rename from legacy/eina/src/include/eina_sched.h
rename to src/include/eina/eina_sched.h
diff --git a/legacy/eina/src/include/eina_simple_xml_parser.h b/src/include/eina/eina_simple_xml_parser.h
similarity index 100%
rename from legacy/eina/src/include/eina_simple_xml_parser.h
rename to src/include/eina/eina_simple_xml_parser.h
diff --git a/legacy/eina/src/include/eina_str.h b/src/include/eina/eina_str.h
similarity index 100%
rename from legacy/eina/src/include/eina_str.h
rename to src/include/eina/eina_str.h
diff --git a/legacy/eina/src/include/eina_strbuf.h b/src/include/eina/eina_strbuf.h
similarity index 100%
rename from legacy/eina/src/include/eina_strbuf.h
rename to src/include/eina/eina_strbuf.h
diff --git a/legacy/eina/src/include/eina_stringshare.h b/src/include/eina/eina_stringshare.h
similarity index 100%
rename from legacy/eina/src/include/eina_stringshare.h
rename to src/include/eina/eina_stringshare.h
diff --git a/legacy/eina/src/include/eina_tiler.h b/src/include/eina/eina_tiler.h
similarity index 100%
rename from legacy/eina/src/include/eina_tiler.h
rename to src/include/eina/eina_tiler.h
diff --git a/legacy/eina/src/include/eina_trash.h b/src/include/eina/eina_trash.h
similarity index 100%
rename from legacy/eina/src/include/eina_trash.h
rename to src/include/eina/eina_trash.h
diff --git a/legacy/eina/src/include/eina_types.h b/src/include/eina/eina_types.h
similarity index 100%
rename from legacy/eina/src/include/eina_types.h
rename to src/include/eina/eina_types.h
diff --git a/legacy/eina/src/include/eina_unicode.h b/src/include/eina/eina_unicode.h
similarity index 100%
rename from legacy/eina/src/include/eina_unicode.h
rename to src/include/eina/eina_unicode.h
diff --git a/legacy/eina/src/include/eina_ustrbuf.h b/src/include/eina/eina_ustrbuf.h
similarity index 100%
rename from legacy/eina/src/include/eina_ustrbuf.h
rename to src/include/eina/eina_ustrbuf.h
diff --git a/legacy/eina/src/include/eina_ustringshare.h b/src/include/eina/eina_ustringshare.h
similarity index 100%
rename from legacy/eina/src/include/eina_ustringshare.h
rename to src/include/eina/eina_ustringshare.h
diff --git a/legacy/eina/src/include/eina_value.h b/src/include/eina/eina_value.h
similarity index 100%
rename from legacy/eina/src/include/eina_value.h
rename to src/include/eina/eina_value.h
diff --git a/legacy/eina/src/include/eina_xattr.h b/src/include/eina/eina_xattr.h
similarity index 100%
rename from legacy/eina/src/include/eina_xattr.h
rename to src/include/eina/eina_xattr.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d89d02e560..92c50645f5 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,3 +7,5 @@ if HAVE_WINDOWS
 SUBDIRS += evil
 
 endif
+
+SUBDIRS += eina
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
new file mode 100644
index 0000000000..7b1901238f
--- /dev/null
+++ b/src/lib/eina/Makefile.am
@@ -0,0 +1,111 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EFL_EINA_BUILD@ \
+@EFL_PTHREAD_CFLAGS@ \
+@EINA_CFLAGS@ \
+@VALGRIND_CFLAGS@
+
+lib_LTLIBRARIES = libeina.la
+
+libeina_la_SOURCES = \
+eina_accessor.c \
+eina_array.c \
+eina_benchmark.c \
+eina_binbuf.c \
+eina_binshare.c \
+eina_convert.c \
+eina_counter.c \
+eina_cpu.c \
+eina_error.c \
+eina_fp.c \
+eina_hamster.c \
+eina_hash.c \
+eina_inarray.c \
+eina_inlist.c \
+eina_iterator.c \
+eina_lalloc.c \
+eina_list.c \
+eina_log.c \
+eina_magic.c \
+eina_main.c \
+eina_matrixsparse.c \
+eina_mempool.c \
+eina_mmap.c \
+eina_module.c \
+eina_prefix.c \
+eina_quadtree.c \
+eina_rbtree.c \
+eina_rectangle.c \
+eina_safety_checks.c \
+eina_sched.c \
+eina_share_common.c \
+eina_simple_xml_parser.c \
+eina_str.c \
+eina_strbuf.c \
+eina_strbuf_common.c \
+eina_stringshare.c \
+eina_tiler.c \
+eina_unicode.c \
+eina_ustrbuf.c \
+eina_ustringshare.c \
+eina_value.c \
+eina_xattr.c \
+eina_share_common.h \
+eina_private.h \
+eina_strbuf_common.h
+
+# Will be back for developper after 1.2
+# eina_model.c \
+# eina_object.c
+
+if HAVE_WIN32
+libeina_la_SOURCES += eina_file_win32.c
+else
+libeina_la_SOURCES += eina_file.c
+endif
+
+EXTRA_DIST = \
+eina_strbuf_template_c.x \
+eina_binbuf_template_c.x
+
+
+
+if EINA_STATIC_BUILD_BUDDY
+libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/buddy/eina_buddy.c
+endif
+
+if EINA_STATIC_BUILD_CHAINED_POOL
+libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
+endif
+
+if EINA_STATIC_BUILD_EMEMOA_FIXED
+libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c
+endif
+
+if EINA_STATIC_BUILD_EMEMOA_UNKNOWN
+libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c
+endif
+
+if EINA_STATIC_BUILD_FIXED_BITMAP
+libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c
+endif
+
+if EINA_STATIC_BUILD_ONE_BIG
+libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/one_big/eina_one_big.c
+endif
+
+if EINA_STATIC_BUILD_PASS_THROUGH
+libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/pass_through/eina_pass_through.c
+endif
+
+libeina_la_LIBADD = @EINA_LIBS@ -lm
+libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
+
+clean-local:
+	rm -rf *.gcno
diff --git a/legacy/eina/src/lib/eina_accessor.c b/src/lib/eina/eina_accessor.c
similarity index 100%
rename from legacy/eina/src/lib/eina_accessor.c
rename to src/lib/eina/eina_accessor.c
diff --git a/legacy/eina/src/lib/eina_array.c b/src/lib/eina/eina_array.c
similarity index 100%
rename from legacy/eina/src/lib/eina_array.c
rename to src/lib/eina/eina_array.c
diff --git a/legacy/eina/src/lib/eina_benchmark.c b/src/lib/eina/eina_benchmark.c
similarity index 100%
rename from legacy/eina/src/lib/eina_benchmark.c
rename to src/lib/eina/eina_benchmark.c
diff --git a/legacy/eina/src/lib/eina_binbuf.c b/src/lib/eina/eina_binbuf.c
similarity index 100%
rename from legacy/eina/src/lib/eina_binbuf.c
rename to src/lib/eina/eina_binbuf.c
diff --git a/legacy/eina/src/lib/eina_binbuf_template_c.x b/src/lib/eina/eina_binbuf_template_c.x
similarity index 100%
rename from legacy/eina/src/lib/eina_binbuf_template_c.x
rename to src/lib/eina/eina_binbuf_template_c.x
diff --git a/legacy/eina/src/lib/eina_binshare.c b/src/lib/eina/eina_binshare.c
similarity index 100%
rename from legacy/eina/src/lib/eina_binshare.c
rename to src/lib/eina/eina_binshare.c
diff --git a/legacy/eina/src/lib/eina_convert.c b/src/lib/eina/eina_convert.c
similarity index 100%
rename from legacy/eina/src/lib/eina_convert.c
rename to src/lib/eina/eina_convert.c
diff --git a/legacy/eina/src/lib/eina_counter.c b/src/lib/eina/eina_counter.c
similarity index 100%
rename from legacy/eina/src/lib/eina_counter.c
rename to src/lib/eina/eina_counter.c
diff --git a/legacy/eina/src/lib/eina_cpu.c b/src/lib/eina/eina_cpu.c
similarity index 100%
rename from legacy/eina/src/lib/eina_cpu.c
rename to src/lib/eina/eina_cpu.c
diff --git a/legacy/eina/src/lib/eina_error.c b/src/lib/eina/eina_error.c
similarity index 100%
rename from legacy/eina/src/lib/eina_error.c
rename to src/lib/eina/eina_error.c
diff --git a/legacy/eina/src/lib/eina_file.c b/src/lib/eina/eina_file.c
similarity index 100%
rename from legacy/eina/src/lib/eina_file.c
rename to src/lib/eina/eina_file.c
diff --git a/legacy/eina/src/lib/eina_file_win32.c b/src/lib/eina/eina_file_win32.c
similarity index 100%
rename from legacy/eina/src/lib/eina_file_win32.c
rename to src/lib/eina/eina_file_win32.c
diff --git a/legacy/eina/src/lib/eina_fp.c b/src/lib/eina/eina_fp.c
similarity index 100%
rename from legacy/eina/src/lib/eina_fp.c
rename to src/lib/eina/eina_fp.c
diff --git a/legacy/eina/src/lib/eina_hamster.c b/src/lib/eina/eina_hamster.c
similarity index 100%
rename from legacy/eina/src/lib/eina_hamster.c
rename to src/lib/eina/eina_hamster.c
diff --git a/legacy/eina/src/lib/eina_hash.c b/src/lib/eina/eina_hash.c
similarity index 100%
rename from legacy/eina/src/lib/eina_hash.c
rename to src/lib/eina/eina_hash.c
diff --git a/legacy/eina/src/lib/eina_inarray.c b/src/lib/eina/eina_inarray.c
similarity index 100%
rename from legacy/eina/src/lib/eina_inarray.c
rename to src/lib/eina/eina_inarray.c
diff --git a/legacy/eina/src/lib/eina_inlist.c b/src/lib/eina/eina_inlist.c
similarity index 100%
rename from legacy/eina/src/lib/eina_inlist.c
rename to src/lib/eina/eina_inlist.c
diff --git a/legacy/eina/src/lib/eina_iterator.c b/src/lib/eina/eina_iterator.c
similarity index 100%
rename from legacy/eina/src/lib/eina_iterator.c
rename to src/lib/eina/eina_iterator.c
diff --git a/legacy/eina/src/lib/eina_lalloc.c b/src/lib/eina/eina_lalloc.c
similarity index 100%
rename from legacy/eina/src/lib/eina_lalloc.c
rename to src/lib/eina/eina_lalloc.c
diff --git a/legacy/eina/src/lib/eina_list.c b/src/lib/eina/eina_list.c
similarity index 100%
rename from legacy/eina/src/lib/eina_list.c
rename to src/lib/eina/eina_list.c
diff --git a/legacy/eina/src/lib/eina_log.c b/src/lib/eina/eina_log.c
similarity index 100%
rename from legacy/eina/src/lib/eina_log.c
rename to src/lib/eina/eina_log.c
diff --git a/legacy/eina/src/lib/eina_magic.c b/src/lib/eina/eina_magic.c
similarity index 100%
rename from legacy/eina/src/lib/eina_magic.c
rename to src/lib/eina/eina_magic.c
diff --git a/legacy/eina/src/lib/eina_main.c b/src/lib/eina/eina_main.c
similarity index 100%
rename from legacy/eina/src/lib/eina_main.c
rename to src/lib/eina/eina_main.c
diff --git a/legacy/eina/src/lib/eina_matrixsparse.c b/src/lib/eina/eina_matrixsparse.c
similarity index 100%
rename from legacy/eina/src/lib/eina_matrixsparse.c
rename to src/lib/eina/eina_matrixsparse.c
diff --git a/legacy/eina/src/lib/eina_mempool.c b/src/lib/eina/eina_mempool.c
similarity index 100%
rename from legacy/eina/src/lib/eina_mempool.c
rename to src/lib/eina/eina_mempool.c
diff --git a/legacy/eina/src/lib/eina_mmap.c b/src/lib/eina/eina_mmap.c
similarity index 100%
rename from legacy/eina/src/lib/eina_mmap.c
rename to src/lib/eina/eina_mmap.c
diff --git a/legacy/eina/src/lib/eina_model.c b/src/lib/eina/eina_model.c
similarity index 100%
rename from legacy/eina/src/lib/eina_model.c
rename to src/lib/eina/eina_model.c
diff --git a/legacy/eina/src/lib/eina_module.c b/src/lib/eina/eina_module.c
similarity index 100%
rename from legacy/eina/src/lib/eina_module.c
rename to src/lib/eina/eina_module.c
diff --git a/legacy/eina/src/lib/eina_object.c b/src/lib/eina/eina_object.c
similarity index 100%
rename from legacy/eina/src/lib/eina_object.c
rename to src/lib/eina/eina_object.c
diff --git a/legacy/eina/src/lib/eina_prefix.c b/src/lib/eina/eina_prefix.c
similarity index 100%
rename from legacy/eina/src/lib/eina_prefix.c
rename to src/lib/eina/eina_prefix.c
diff --git a/legacy/eina/src/lib/eina_private.h b/src/lib/eina/eina_private.h
similarity index 100%
rename from legacy/eina/src/lib/eina_private.h
rename to src/lib/eina/eina_private.h
diff --git a/legacy/eina/src/lib/eina_quadtree.c b/src/lib/eina/eina_quadtree.c
similarity index 100%
rename from legacy/eina/src/lib/eina_quadtree.c
rename to src/lib/eina/eina_quadtree.c
diff --git a/legacy/eina/src/lib/eina_rbtree.c b/src/lib/eina/eina_rbtree.c
similarity index 100%
rename from legacy/eina/src/lib/eina_rbtree.c
rename to src/lib/eina/eina_rbtree.c
diff --git a/legacy/eina/src/lib/eina_rectangle.c b/src/lib/eina/eina_rectangle.c
similarity index 100%
rename from legacy/eina/src/lib/eina_rectangle.c
rename to src/lib/eina/eina_rectangle.c
diff --git a/legacy/eina/src/lib/eina_safety_checks.c b/src/lib/eina/eina_safety_checks.c
similarity index 100%
rename from legacy/eina/src/lib/eina_safety_checks.c
rename to src/lib/eina/eina_safety_checks.c
diff --git a/legacy/eina/src/lib/eina_sched.c b/src/lib/eina/eina_sched.c
similarity index 100%
rename from legacy/eina/src/lib/eina_sched.c
rename to src/lib/eina/eina_sched.c
diff --git a/legacy/eina/src/lib/eina_share_common.c b/src/lib/eina/eina_share_common.c
similarity index 100%
rename from legacy/eina/src/lib/eina_share_common.c
rename to src/lib/eina/eina_share_common.c
diff --git a/legacy/eina/src/lib/eina_share_common.h b/src/lib/eina/eina_share_common.h
similarity index 100%
rename from legacy/eina/src/lib/eina_share_common.h
rename to src/lib/eina/eina_share_common.h
diff --git a/legacy/eina/src/lib/eina_simple_xml_parser.c b/src/lib/eina/eina_simple_xml_parser.c
similarity index 100%
rename from legacy/eina/src/lib/eina_simple_xml_parser.c
rename to src/lib/eina/eina_simple_xml_parser.c
diff --git a/legacy/eina/src/lib/eina_str.c b/src/lib/eina/eina_str.c
similarity index 100%
rename from legacy/eina/src/lib/eina_str.c
rename to src/lib/eina/eina_str.c
diff --git a/legacy/eina/src/lib/eina_strbuf.c b/src/lib/eina/eina_strbuf.c
similarity index 100%
rename from legacy/eina/src/lib/eina_strbuf.c
rename to src/lib/eina/eina_strbuf.c
diff --git a/legacy/eina/src/lib/eina_strbuf_common.c b/src/lib/eina/eina_strbuf_common.c
similarity index 100%
rename from legacy/eina/src/lib/eina_strbuf_common.c
rename to src/lib/eina/eina_strbuf_common.c
diff --git a/legacy/eina/src/lib/eina_strbuf_common.h b/src/lib/eina/eina_strbuf_common.h
similarity index 100%
rename from legacy/eina/src/lib/eina_strbuf_common.h
rename to src/lib/eina/eina_strbuf_common.h
diff --git a/legacy/eina/src/lib/eina_strbuf_template_c.x b/src/lib/eina/eina_strbuf_template_c.x
similarity index 100%
rename from legacy/eina/src/lib/eina_strbuf_template_c.x
rename to src/lib/eina/eina_strbuf_template_c.x
diff --git a/legacy/eina/src/lib/eina_stringshare.c b/src/lib/eina/eina_stringshare.c
similarity index 100%
rename from legacy/eina/src/lib/eina_stringshare.c
rename to src/lib/eina/eina_stringshare.c
diff --git a/legacy/eina/src/lib/eina_tiler.c b/src/lib/eina/eina_tiler.c
similarity index 100%
rename from legacy/eina/src/lib/eina_tiler.c
rename to src/lib/eina/eina_tiler.c
diff --git a/legacy/eina/src/lib/eina_unicode.c b/src/lib/eina/eina_unicode.c
similarity index 100%
rename from legacy/eina/src/lib/eina_unicode.c
rename to src/lib/eina/eina_unicode.c
diff --git a/legacy/eina/src/lib/eina_ustrbuf.c b/src/lib/eina/eina_ustrbuf.c
similarity index 100%
rename from legacy/eina/src/lib/eina_ustrbuf.c
rename to src/lib/eina/eina_ustrbuf.c
diff --git a/legacy/eina/src/lib/eina_ustringshare.c b/src/lib/eina/eina_ustringshare.c
similarity index 100%
rename from legacy/eina/src/lib/eina_ustringshare.c
rename to src/lib/eina/eina_ustringshare.c
diff --git a/legacy/eina/src/lib/eina_value.c b/src/lib/eina/eina_value.c
similarity index 100%
rename from legacy/eina/src/lib/eina_value.c
rename to src/lib/eina/eina_value.c
diff --git a/legacy/eina/src/lib/eina_xattr.c b/src/lib/eina/eina_xattr.c
similarity index 100%
rename from legacy/eina/src/lib/eina_xattr.c
rename to src/lib/eina/eina_xattr.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
new file mode 100644
index 0000000000..b8f642fb72
--- /dev/null
+++ b/src/modules/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = eina
diff --git a/src/modules/eina/Makefile.am b/src/modules/eina/Makefile.am
new file mode 100644
index 0000000000..53e28b7bf9
--- /dev/null
+++ b/src/modules/eina/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = mp
+
+MAINTAINERCLEANFILES = \
+Makefile.in
\ No newline at end of file
diff --git a/src/modules/eina/mp/Makefile.am b/src/modules/eina/mp/Makefile.am
new file mode 100644
index 0000000000..435d57a96a
--- /dev/null
+++ b/src/modules/eina/mp/Makefile.am
@@ -0,0 +1,45 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS =
+
+if EINA_BUILD_BUDDY
+if !EINA_STATIC_BUILD_BUDDY
+SUBDIRS += buddy
+endif
+endif
+
+if EINA_BUILD_CHAINED_POOL
+if !EINA_STATIC_BUILD_CHAINED_POOL
+SUBDIRS += chained_pool
+endif
+endif
+
+if EINA_BUILD_EMEMOA_FIXED
+if !EINA_STATIC_BUILD_EMEMOA_FIXED
+SUBDIRS += ememoa_fixed
+endif
+endif
+
+if EINA_BUILD_EMEMOA_UNKNOWN
+if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN
+SUBDIRS += ememoa_unknown
+endif
+endif
+
+if EINA_BUILD_FIXED_BITMAP
+if !EINA_STATIC_BUILD_FIXED_BITMAP
+SUBDIRS += fixed_bitmap
+endif
+endif
+
+if EINA_BUILD_ONE_BIG
+if !EINA_STATIC_BUILD_ONE_BIG
+SUBDIRS += one_big
+endif
+endif
+
+if EINA_BUILD_PASS_THROUGH
+if !EINA_STATIC_BUILD_PASS_THROUGH
+SUBDIRS += pass_through
+endif
+endif
diff --git a/src/modules/eina/mp/buddy/Makefile.am b/src/modules/eina/mp/buddy/Makefile.am
new file mode 100644
index 0000000000..e43db1aa87
--- /dev/null
+++ b/src/modules/eina/mp/buddy/Makefile.am
@@ -0,0 +1,27 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+@EFL_EINA_BUILD@
+
+controllerdir = $(libdir)/eina/modules/mp/buddy/$(MODULE_ARCH)
+controller_LTLIBRARIES = module.la
+
+module_la_SOURCES = eina_buddy.c
+
+module_la_CFLAGS = @EINA_CFLAGS@
+module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
+module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_la_LIBTOOLFLAGS = --tag=disable-static
+
+install-data-hook:
+	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+uninstall-hook:
+	rm -f $(DESTDIR)$(controllerdir)/module.*
+
+clean-local:
+	rm -rf *.gcno
diff --git a/legacy/eina/src/modules/mp/buddy/eina_buddy.c b/src/modules/eina/mp/buddy/eina_buddy.c
similarity index 100%
rename from legacy/eina/src/modules/mp/buddy/eina_buddy.c
rename to src/modules/eina/mp/buddy/eina_buddy.c
diff --git a/src/modules/eina/mp/chained_pool/Makefile.am b/src/modules/eina/mp/chained_pool/Makefile.am
new file mode 100644
index 0000000000..4e93445815
--- /dev/null
+++ b/src/modules/eina/mp/chained_pool/Makefile.am
@@ -0,0 +1,28 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+@EFL_EINA_BUILD@ \
+@VALGRIND_CFLAGS@
+
+controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
+controller_LTLIBRARIES = module.la
+
+module_la_SOURCES = eina_chained_mempool.c
+
+module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
+module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
+module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version @EFL_PTHREAD_LIBS@
+module_la_LIBTOOLFLAGS = --tag=disable-static
+
+install-data-hook:
+	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+uninstall-hook:
+	rm -f $(DESTDIR)$(controllerdir)/module.*
+
+clean-local:
+	rm -rf *.gcno
diff --git a/legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
similarity index 100%
rename from legacy/eina/src/modules/mp/chained_pool/eina_chained_mempool.c
rename to src/modules/eina/mp/chained_pool/eina_chained_mempool.c
diff --git a/src/modules/eina/mp/ememoa_fixed/Makefile.am b/src/modules/eina/mp/ememoa_fixed/Makefile.am
new file mode 100644
index 0000000000..50a4115adf
--- /dev/null
+++ b/src/modules/eina/mp/ememoa_fixed/Makefile.am
@@ -0,0 +1,28 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+@EMEMOA_CFLAGS@ \
+@EFL_EINA_BUILD@
+
+controllerdir = $(libdir)/eina/modules/mp/ememoa_fixed/$(MODULE_ARCH)
+controller_LTLIBRARIES = module.la
+
+module_la_SOURCES = eina_ememoa_fixed.c
+
+module_la_CFLAGS = @EINA_CFLAGS@
+module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EMEMOA_LIBS@ @EINA_LIBS@
+module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_la_LIBTOOLFLAGS = --tag=disable-static
+
+install-data-hook:
+	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+uninstall-hook:
+	rm -f $(DESTDIR)$(controllerdir)/module.*
+
+clean-local:
+	rm -rf *.gcno
diff --git a/legacy/eina/src/modules/mp/ememoa_fixed/eina_ememoa_fixed.c b/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c
similarity index 100%
rename from legacy/eina/src/modules/mp/ememoa_fixed/eina_ememoa_fixed.c
rename to src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c
diff --git a/src/modules/eina/mp/ememoa_unknown/Makefile.am b/src/modules/eina/mp/ememoa_unknown/Makefile.am
new file mode 100644
index 0000000000..9713137110
--- /dev/null
+++ b/src/modules/eina/mp/ememoa_unknown/Makefile.am
@@ -0,0 +1,28 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+@EMEMOA_CFLAGS@ \
+@EFL_EINA_BUILD@
+
+controllerdir = $(libdir)/eina/modules/mp/ememoa_unknown/$(MODULE_ARCH)
+controller_LTLIBRARIES = module.la
+
+module_la_SOURCES = eina_ememoa_unknown.c
+
+module_la_CFLAGS = @EINA_CFLAGS@
+module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EMEMOA_LIBS@ @EINA_LIBS@
+module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_la_LIBTOOLFLAGS = --tag=disable-static
+
+install-data-hook:
+	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+uninstall-hook:
+	rm -f $(DESTDIR)$(controllerdir)/module.*
+
+clean-local:
+	rm -rf *.gcno
diff --git a/legacy/eina/src/modules/mp/ememoa_unknown/eina_ememoa_unknown.c b/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c
similarity index 100%
rename from legacy/eina/src/modules/mp/ememoa_unknown/eina_ememoa_unknown.c
rename to src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c
diff --git a/src/modules/eina/mp/fixed_bitmap/Makefile.am b/src/modules/eina/mp/fixed_bitmap/Makefile.am
new file mode 100644
index 0000000000..2143676008
--- /dev/null
+++ b/src/modules/eina/mp/fixed_bitmap/Makefile.am
@@ -0,0 +1,27 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+@EFL_EINA_BUILD@
+
+controllerdir = $(libdir)/eina/modules/mp/fixed_bitmap/$(MODULE_ARCH)
+controller_LTLIBRARIES = module.la
+
+module_la_SOURCES = eina_fixed_bitmap.c
+
+module_la_CFLAGS = @EINA_CFLAGS@
+module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
+module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_la_LIBTOOLFLAGS = --tag=disable-static
+
+install-data-hook:
+	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+uninstall-hook:
+	rm -f $(DESTDIR)$(controllerdir)/module.*
+
+clean-local:
+	rm -rf *.gcno
diff --git a/legacy/eina/src/modules/mp/fixed_bitmap/eina_fixed_bitmap.c b/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c
similarity index 100%
rename from legacy/eina/src/modules/mp/fixed_bitmap/eina_fixed_bitmap.c
rename to src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c
diff --git a/src/modules/eina/mp/one_big/Makefile.am b/src/modules/eina/mp/one_big/Makefile.am
new file mode 100644
index 0000000000..6a5efa531e
--- /dev/null
+++ b/src/modules/eina/mp/one_big/Makefile.am
@@ -0,0 +1,28 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+@EFL_EINA_BUILD@ \
+@VALGRIND_CFLAGS@
+
+controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
+controller_LTLIBRARIES = module.la
+
+module_la_SOURCES = eina_one_big.c
+
+module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
+module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
+module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version @EFL_PTHREAD_LIBS@
+module_la_LIBTOOLFLAGS = --tag=disable-static
+
+install-data-hook:
+	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+uninstall-hook:
+	rm -f $(DESTDIR)$(controllerdir)/module.*
+
+clean-local:
+	rm -rf *.gcno
diff --git a/legacy/eina/src/modules/mp/one_big/eina_one_big.c b/src/modules/eina/mp/one_big/eina_one_big.c
similarity index 100%
rename from legacy/eina/src/modules/mp/one_big/eina_one_big.c
rename to src/modules/eina/mp/one_big/eina_one_big.c
diff --git a/src/modules/eina/mp/pass_through/Makefile.am b/src/modules/eina/mp/pass_through/Makefile.am
new file mode 100644
index 0000000000..6d5f1687ee
--- /dev/null
+++ b/src/modules/eina/mp/pass_through/Makefile.am
@@ -0,0 +1,27 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+@EFL_EINA_BUILD@
+
+controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH)
+controller_LTLIBRARIES = module.la
+
+module_la_SOURCES = eina_pass_through.c
+
+module_la_CFLAGS = @EINA_CFLAGS@
+module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
+module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_la_LIBTOOLFLAGS = --tag=disable-static
+
+install-data-hook:
+	rm -f $(DESTDIR)$(controllerdir)/$(controller_LTLIBRARIES)
+uninstall-hook:
+	rm -f $(DESTDIR)$(controllerdir)/module.*
+
+clean-local:
+	rm -rf *.gcno
diff --git a/legacy/eina/src/modules/mp/pass_through/eina_pass_through.c b/src/modules/eina/mp/pass_through/eina_pass_through.c
similarity index 100%
rename from legacy/eina/src/modules/mp/pass_through/eina_pass_through.c
rename to src/modules/eina/mp/pass_through/eina_pass_through.c
diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am
new file mode 100644
index 0000000000..b8f642fb72
--- /dev/null
+++ b/src/scripts/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = eina
diff --git a/src/scripts/eina/Makefile.am b/src/scripts/eina/Makefile.am
new file mode 100644
index 0000000000..6b150a3dad
--- /dev/null
+++ b/src/scripts/eina/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+bin_SCRIPTS = eina-bench-cmp
+
+EXTRA_DIST = $(bin_SCRIPTS)
diff --git a/legacy/eina/src/scripts/eina-bench-cmp b/src/scripts/eina/eina-bench-cmp
similarity index 100%
rename from legacy/eina/src/scripts/eina-bench-cmp
rename to src/scripts/eina/eina-bench-cmp
diff --git a/legacy/eina/src/tests/Ecore_Data.h b/src/tests/eina/Ecore_Data.h
similarity index 100%
rename from legacy/eina/src/tests/Ecore_Data.h
rename to src/tests/eina/Ecore_Data.h
diff --git a/legacy/eina/src/tests/Evas_Data.h b/src/tests/eina/Evas_Data.h
similarity index 100%
rename from legacy/eina/src/tests/Evas_Data.h
rename to src/tests/eina/Evas_Data.h
diff --git a/src/tests/eina/Makefile.am b/src/tests/eina/Makefile.am
new file mode 100644
index 0000000000..f6810e22c7
--- /dev/null
+++ b/src/tests/eina/Makefile.am
@@ -0,0 +1,142 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+benchdir = $(bindir)
+
+AM_CPPFLAGS = 					\
+-I$(top_srcdir)/src/lib 			\
+-I$(top_srcdir)/src/include 			\
+-I$(top_builddir)/src/include 			\
+-I$(top_builddir)/src/lib 			\
+-DPACKAGE_BIN_DIR=\"$(bindir)\" 		\
+-DPACKAGE_LIB_DIR=\"$(libdir)\" 		\
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" 	\
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" 	\
+@CHECK_CFLAGS@					\
+@EINA_CFLAGS@					\
+@GLIB_CFLAGS@
+
+if EINA_HAVE_GLIB
+
+AM_CPPFLAGS += -DEINA_BENCH_HAVE_GLIB
+
+endif
+
+if EINA_ENABLE_BENCHMARK_E17
+
+AM_CPPFLAGS += -DEINA_ENABLE_BENCH_E17
+
+endif
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS = eina_suite cxx_compile_test
+
+eina_suite_SOURCES = 	\
+eina_suite.c 		\
+eina_test_fp.c		\
+eina_test_stringshare.c \
+eina_test_ustringshare.c\
+eina_test_ustr.c	\
+eina_test_binshare.c    \
+eina_test_binbuf.c	\
+eina_test_inarray.c 	\
+eina_test_array.c 	\
+eina_test_clist.c	\
+eina_test_error.c	\
+eina_test_sched.c       \
+eina_test_log.c 	\
+eina_test_magic.c 	\
+eina_test_inlist.c 	\
+eina_test_main.c 	\
+eina_test_counter.c 	\
+eina_test_lalloc.c 	\
+eina_test_hash.c 	\
+eina_test_iterator.c	\
+eina_test_accessor.c	\
+eina_test_module.c	\
+eina_test_convert.c	\
+eina_test_rbtree.c	\
+eina_test_file.c	\
+eina_test_benchmark.c	\
+eina_test_mempool.c	\
+eina_test_rectangle.c	\
+eina_test_list.c	\
+eina_test_matrixsparse.c \
+eina_test_tiler.c       \
+eina_test_strbuf.c	\
+eina_test_str.c		\
+eina_test_quadtree.c	\
+eina_test_simple_xml_parser.c \
+eina_test_value.c
+# eina_test_model.c
+
+eina_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ -lm
+
+cxx_compile_test_SOURCES = cxx_compile_test.cxx
+cxx_compile_test_LDADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@
+
+module_dummydir = $(libdir)/eina/test
+module_dummy_LTLIBRARIES = module_dummy.la
+
+module_dummy_la_SOURCES = \
+eina_test_module_dummy.c
+
+module_dummy_la_CPPFLAGS = 			\
+-I$(top_srcdir)/src/lib 			\
+-I$(top_srcdir)/src/include 			\
+-I$(top_builddir)/src/include 			\
+-I$(top_builddir)/src/lib 			\
+@EFL_EINA_BUILD@
+module_dummy_la_LIBADD       = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ -lm
+module_dummy_la_LDFLAGS      = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
+
+endif
+
+if EFL_ENABLE_BENCHMARK
+
+bench_PROGRAMS = eina_bench
+
+eina_bench_SOURCES = 	\
+eina_bench.c 		\
+eina_bench_sort.c	\
+eina_bench_hash.c	\
+eina_bench_stringshare.c \
+eina_bench_convert.c	\
+eina_bench_mempool.c	\
+eina_bench_stringshare_e17.c \
+eina_bench_array.c	\
+eina_bench_rectangle_pool.c \
+ecore_list.c \
+ecore_strings.c \
+ecore_hash.c \
+ecore_sheap.c \
+evas_hash.c \
+evas_list.c \
+evas_mempool.c \
+evas_object_list.c \
+evas_stringshare.c \
+eina_bench_quad.c \
+eina_bench.h \
+eina_suite.h \
+Ecore_Data.h \
+Evas_Data.h \
+evas_mempool.h
+
+if CITYHASH_BENCH
+noinst_LTLIBRARIES = libcity.la
+libcity_la_SOURCES = city.cc
+
+nodist_EXTRA_eina_bench_SOURCES = dummy.cc
+eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/libeina.la libcity.la @EINA_LIBS@
+else
+eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/libeina.la @EINA_LIBS@
+
+endif
+
+endif
+
+EXTRA_DIST = strlog
+
+clean-local:
+	rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
diff --git a/legacy/eina/src/tests/city.cc b/src/tests/eina/city.cc
similarity index 100%
rename from legacy/eina/src/tests/city.cc
rename to src/tests/eina/city.cc
diff --git a/legacy/eina/src/tests/city.h b/src/tests/eina/city.h
similarity index 100%
rename from legacy/eina/src/tests/city.h
rename to src/tests/eina/city.h
diff --git a/legacy/eina/src/tests/cxx_compile_test.cxx b/src/tests/eina/cxx_compile_test.cxx
similarity index 100%
rename from legacy/eina/src/tests/cxx_compile_test.cxx
rename to src/tests/eina/cxx_compile_test.cxx
diff --git a/legacy/eina/src/tests/ecore_hash.c b/src/tests/eina/ecore_hash.c
similarity index 100%
rename from legacy/eina/src/tests/ecore_hash.c
rename to src/tests/eina/ecore_hash.c
diff --git a/legacy/eina/src/tests/ecore_list.c b/src/tests/eina/ecore_list.c
similarity index 100%
rename from legacy/eina/src/tests/ecore_list.c
rename to src/tests/eina/ecore_list.c
diff --git a/legacy/eina/src/tests/ecore_sheap.c b/src/tests/eina/ecore_sheap.c
similarity index 100%
rename from legacy/eina/src/tests/ecore_sheap.c
rename to src/tests/eina/ecore_sheap.c
diff --git a/legacy/eina/src/tests/ecore_strings.c b/src/tests/eina/ecore_strings.c
similarity index 100%
rename from legacy/eina/src/tests/ecore_strings.c
rename to src/tests/eina/ecore_strings.c
diff --git a/legacy/eina/src/tests/eina_bench.c b/src/tests/eina/eina_bench.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench.c
rename to src/tests/eina/eina_bench.c
diff --git a/legacy/eina/src/tests/eina_bench.h b/src/tests/eina/eina_bench.h
similarity index 100%
rename from legacy/eina/src/tests/eina_bench.h
rename to src/tests/eina/eina_bench.h
diff --git a/legacy/eina/src/tests/eina_bench_array.c b/src/tests/eina/eina_bench_array.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_array.c
rename to src/tests/eina/eina_bench_array.c
diff --git a/legacy/eina/src/tests/eina_bench_convert.c b/src/tests/eina/eina_bench_convert.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_convert.c
rename to src/tests/eina/eina_bench_convert.c
diff --git a/legacy/eina/src/tests/eina_bench_hash.c b/src/tests/eina/eina_bench_hash.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_hash.c
rename to src/tests/eina/eina_bench_hash.c
diff --git a/legacy/eina/src/tests/eina_bench_mempool.c b/src/tests/eina/eina_bench_mempool.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_mempool.c
rename to src/tests/eina/eina_bench_mempool.c
diff --git a/legacy/eina/src/tests/eina_bench_quad.c b/src/tests/eina/eina_bench_quad.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_quad.c
rename to src/tests/eina/eina_bench_quad.c
diff --git a/legacy/eina/src/tests/eina_bench_rectangle_pool.c b/src/tests/eina/eina_bench_rectangle_pool.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_rectangle_pool.c
rename to src/tests/eina/eina_bench_rectangle_pool.c
diff --git a/legacy/eina/src/tests/eina_bench_sort.c b/src/tests/eina/eina_bench_sort.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_sort.c
rename to src/tests/eina/eina_bench_sort.c
diff --git a/legacy/eina/src/tests/eina_bench_stringshare.c b/src/tests/eina/eina_bench_stringshare.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_stringshare.c
rename to src/tests/eina/eina_bench_stringshare.c
diff --git a/legacy/eina/src/tests/eina_bench_stringshare_e17.c b/src/tests/eina/eina_bench_stringshare_e17.c
similarity index 100%
rename from legacy/eina/src/tests/eina_bench_stringshare_e17.c
rename to src/tests/eina/eina_bench_stringshare_e17.c
diff --git a/legacy/eina/src/tests/eina_suite.c b/src/tests/eina/eina_suite.c
similarity index 100%
rename from legacy/eina/src/tests/eina_suite.c
rename to src/tests/eina/eina_suite.c
diff --git a/legacy/eina/src/tests/eina_suite.h b/src/tests/eina/eina_suite.h
similarity index 100%
rename from legacy/eina/src/tests/eina_suite.h
rename to src/tests/eina/eina_suite.h
diff --git a/legacy/eina/src/tests/eina_test_accessor.c b/src/tests/eina/eina_test_accessor.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_accessor.c
rename to src/tests/eina/eina_test_accessor.c
diff --git a/legacy/eina/src/tests/eina_test_array.c b/src/tests/eina/eina_test_array.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_array.c
rename to src/tests/eina/eina_test_array.c
diff --git a/legacy/eina/src/tests/eina_test_benchmark.c b/src/tests/eina/eina_test_benchmark.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_benchmark.c
rename to src/tests/eina/eina_test_benchmark.c
diff --git a/legacy/eina/src/tests/eina_test_binbuf.c b/src/tests/eina/eina_test_binbuf.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_binbuf.c
rename to src/tests/eina/eina_test_binbuf.c
diff --git a/legacy/eina/src/tests/eina_test_binshare.c b/src/tests/eina/eina_test_binshare.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_binshare.c
rename to src/tests/eina/eina_test_binshare.c
diff --git a/legacy/eina/src/tests/eina_test_clist.c b/src/tests/eina/eina_test_clist.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_clist.c
rename to src/tests/eina/eina_test_clist.c
diff --git a/legacy/eina/src/tests/eina_test_convert.c b/src/tests/eina/eina_test_convert.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_convert.c
rename to src/tests/eina/eina_test_convert.c
diff --git a/legacy/eina/src/tests/eina_test_counter.c b/src/tests/eina/eina_test_counter.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_counter.c
rename to src/tests/eina/eina_test_counter.c
diff --git a/legacy/eina/src/tests/eina_test_error.c b/src/tests/eina/eina_test_error.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_error.c
rename to src/tests/eina/eina_test_error.c
diff --git a/legacy/eina/src/tests/eina_test_file.c b/src/tests/eina/eina_test_file.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_file.c
rename to src/tests/eina/eina_test_file.c
diff --git a/legacy/eina/src/tests/eina_test_fp.c b/src/tests/eina/eina_test_fp.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_fp.c
rename to src/tests/eina/eina_test_fp.c
diff --git a/legacy/eina/src/tests/eina_test_hash.c b/src/tests/eina/eina_test_hash.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_hash.c
rename to src/tests/eina/eina_test_hash.c
diff --git a/legacy/eina/src/tests/eina_test_inarray.c b/src/tests/eina/eina_test_inarray.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_inarray.c
rename to src/tests/eina/eina_test_inarray.c
diff --git a/legacy/eina/src/tests/eina_test_inlist.c b/src/tests/eina/eina_test_inlist.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_inlist.c
rename to src/tests/eina/eina_test_inlist.c
diff --git a/legacy/eina/src/tests/eina_test_iterator.c b/src/tests/eina/eina_test_iterator.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_iterator.c
rename to src/tests/eina/eina_test_iterator.c
diff --git a/legacy/eina/src/tests/eina_test_lalloc.c b/src/tests/eina/eina_test_lalloc.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_lalloc.c
rename to src/tests/eina/eina_test_lalloc.c
diff --git a/legacy/eina/src/tests/eina_test_list.c b/src/tests/eina/eina_test_list.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_list.c
rename to src/tests/eina/eina_test_list.c
diff --git a/legacy/eina/src/tests/eina_test_log.c b/src/tests/eina/eina_test_log.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_log.c
rename to src/tests/eina/eina_test_log.c
diff --git a/legacy/eina/src/tests/eina_test_magic.c b/src/tests/eina/eina_test_magic.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_magic.c
rename to src/tests/eina/eina_test_magic.c
diff --git a/legacy/eina/src/tests/eina_test_main.c b/src/tests/eina/eina_test_main.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_main.c
rename to src/tests/eina/eina_test_main.c
diff --git a/legacy/eina/src/tests/eina_test_matrixsparse.c b/src/tests/eina/eina_test_matrixsparse.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_matrixsparse.c
rename to src/tests/eina/eina_test_matrixsparse.c
diff --git a/legacy/eina/src/tests/eina_test_mempool.c b/src/tests/eina/eina_test_mempool.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_mempool.c
rename to src/tests/eina/eina_test_mempool.c
diff --git a/legacy/eina/src/tests/eina_test_model.c b/src/tests/eina/eina_test_model.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_model.c
rename to src/tests/eina/eina_test_model.c
diff --git a/legacy/eina/src/tests/eina_test_module.c b/src/tests/eina/eina_test_module.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_module.c
rename to src/tests/eina/eina_test_module.c
diff --git a/legacy/eina/src/tests/eina_test_module_dummy.c b/src/tests/eina/eina_test_module_dummy.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_module_dummy.c
rename to src/tests/eina/eina_test_module_dummy.c
diff --git a/legacy/eina/src/tests/eina_test_quadtree.c b/src/tests/eina/eina_test_quadtree.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_quadtree.c
rename to src/tests/eina/eina_test_quadtree.c
diff --git a/legacy/eina/src/tests/eina_test_rbtree.c b/src/tests/eina/eina_test_rbtree.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_rbtree.c
rename to src/tests/eina/eina_test_rbtree.c
diff --git a/legacy/eina/src/tests/eina_test_rectangle.c b/src/tests/eina/eina_test_rectangle.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_rectangle.c
rename to src/tests/eina/eina_test_rectangle.c
diff --git a/legacy/eina/src/tests/eina_test_sched.c b/src/tests/eina/eina_test_sched.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_sched.c
rename to src/tests/eina/eina_test_sched.c
diff --git a/legacy/eina/src/tests/eina_test_simple_xml_parser.c b/src/tests/eina/eina_test_simple_xml_parser.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_simple_xml_parser.c
rename to src/tests/eina/eina_test_simple_xml_parser.c
diff --git a/legacy/eina/src/tests/eina_test_str.c b/src/tests/eina/eina_test_str.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_str.c
rename to src/tests/eina/eina_test_str.c
diff --git a/legacy/eina/src/tests/eina_test_strbuf.c b/src/tests/eina/eina_test_strbuf.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_strbuf.c
rename to src/tests/eina/eina_test_strbuf.c
diff --git a/legacy/eina/src/tests/eina_test_stringshare.c b/src/tests/eina/eina_test_stringshare.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_stringshare.c
rename to src/tests/eina/eina_test_stringshare.c
diff --git a/legacy/eina/src/tests/eina_test_tiler.c b/src/tests/eina/eina_test_tiler.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_tiler.c
rename to src/tests/eina/eina_test_tiler.c
diff --git a/legacy/eina/src/tests/eina_test_ustr.c b/src/tests/eina/eina_test_ustr.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_ustr.c
rename to src/tests/eina/eina_test_ustr.c
diff --git a/legacy/eina/src/tests/eina_test_ustringshare.c b/src/tests/eina/eina_test_ustringshare.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_ustringshare.c
rename to src/tests/eina/eina_test_ustringshare.c
diff --git a/legacy/eina/src/tests/eina_test_value.c b/src/tests/eina/eina_test_value.c
similarity index 100%
rename from legacy/eina/src/tests/eina_test_value.c
rename to src/tests/eina/eina_test_value.c
diff --git a/legacy/eina/src/tests/evas_hash.c b/src/tests/eina/evas_hash.c
similarity index 100%
rename from legacy/eina/src/tests/evas_hash.c
rename to src/tests/eina/evas_hash.c
diff --git a/legacy/eina/src/tests/evas_list.c b/src/tests/eina/evas_list.c
similarity index 100%
rename from legacy/eina/src/tests/evas_list.c
rename to src/tests/eina/evas_list.c
diff --git a/legacy/eina/src/tests/evas_mempool.c b/src/tests/eina/evas_mempool.c
similarity index 100%
rename from legacy/eina/src/tests/evas_mempool.c
rename to src/tests/eina/evas_mempool.c
diff --git a/legacy/eina/src/tests/evas_mempool.h b/src/tests/eina/evas_mempool.h
similarity index 100%
rename from legacy/eina/src/tests/evas_mempool.h
rename to src/tests/eina/evas_mempool.h
diff --git a/legacy/eina/src/tests/evas_object_list.c b/src/tests/eina/evas_object_list.c
similarity index 100%
rename from legacy/eina/src/tests/evas_object_list.c
rename to src/tests/eina/evas_object_list.c
diff --git a/legacy/eina/src/tests/evas_stringshare.c b/src/tests/eina/evas_stringshare.c
similarity index 100%
rename from legacy/eina/src/tests/evas_stringshare.c
rename to src/tests/eina/evas_stringshare.c
diff --git a/legacy/eina/src/tests/sample.gpx b/src/tests/eina/sample.gpx
similarity index 100%
rename from legacy/eina/src/tests/sample.gpx
rename to src/tests/eina/sample.gpx
diff --git a/legacy/eina/src/tests/strlog b/src/tests/eina/strlog
similarity index 100%
rename from legacy/eina/src/tests/strlog
rename to src/tests/eina/strlog