diff --git a/etk/Allocator.cpp b/etk-core/Allocator.cpp
similarity index 100%
rename from etk/Allocator.cpp
rename to etk-core/Allocator.cpp
diff --git a/etk/Allocator.hpp b/etk-core/Allocator.hpp
similarity index 100%
rename from etk/Allocator.hpp
rename to etk-core/Allocator.hpp
diff --git a/etk/Array.hpp b/etk-core/Array.hpp
similarity index 100%
rename from etk/Array.hpp
rename to etk-core/Array.hpp
diff --git a/etk/Buffer.hpp b/etk-core/Buffer.hpp
similarity index 100%
rename from etk/Buffer.hpp
rename to etk-core/Buffer.hpp
diff --git a/etk/Exception.cpp b/etk-core/Exception.cpp
similarity index 100%
rename from etk/Exception.cpp
rename to etk-core/Exception.cpp
diff --git a/etk/Exception.hpp b/etk-core/Exception.hpp
similarity index 100%
rename from etk/Exception.hpp
rename to etk-core/Exception.hpp
diff --git a/etk/Function.cpp b/etk-core/Function.cpp
similarity index 100%
rename from etk/Function.cpp
rename to etk-core/Function.cpp
diff --git a/etk/Function.hpp b/etk-core/Function.hpp
similarity index 100%
rename from etk/Function.hpp
rename to etk-core/Function.hpp
diff --git a/etk/Map.hpp b/etk-core/Map.hpp
similarity index 100%
rename from etk/Map.hpp
rename to etk-core/Map.hpp
diff --git a/etk/NullPtr.hpp b/etk-core/NullPtr.hpp
similarity index 100%
rename from etk/NullPtr.hpp
rename to etk-core/NullPtr.hpp
diff --git a/etk/Pair.hpp b/etk-core/Pair.hpp
similarity index 100%
rename from etk/Pair.hpp
rename to etk-core/Pair.hpp
diff --git a/etk/Set.hpp b/etk-core/Set.hpp
similarity index 100%
rename from etk/Set.hpp
rename to etk-core/Set.hpp
diff --git a/etk/Stream.cpp b/etk-core/Stream.cpp
similarity index 100%
rename from etk/Stream.cpp
rename to etk-core/Stream.cpp
diff --git a/etk/Stream.hpp b/etk-core/Stream.hpp
similarity index 100%
rename from etk/Stream.hpp
rename to etk-core/Stream.hpp
diff --git a/etk/String.cpp b/etk-core/String.cpp
similarity index 100%
rename from etk/String.cpp
rename to etk-core/String.cpp
diff --git a/etk/String.hpp b/etk-core/String.hpp
similarity index 100%
rename from etk/String.hpp
rename to etk-core/String.hpp
diff --git a/etk/UString.cpp b/etk-core/UString.cpp
similarity index 100%
rename from etk/UString.cpp
rename to etk-core/UString.cpp
diff --git a/etk/UString.hpp b/etk-core/UString.hpp
similarity index 100%
rename from etk/UString.hpp
rename to etk-core/UString.hpp
diff --git a/etk/Vector.hpp b/etk-core/Vector.hpp
similarity index 100%
rename from etk/Vector.hpp
rename to etk-core/Vector.hpp
diff --git a/etk/move.hpp b/etk-core/move.hpp
similarity index 100%
rename from etk/move.hpp
rename to etk-core/move.hpp
diff --git a/etk/stdTools.cpp b/etk-core/stdTools.cpp
similarity index 100%
rename from etk/stdTools.cpp
rename to etk-core/stdTools.cpp
diff --git a/etk/stdTools.hpp b/etk-core/stdTools.hpp
similarity index 100%
rename from etk/stdTools.hpp
rename to etk-core/stdTools.hpp
diff --git a/etk/typeInfo.cpp b/etk-core/typeInfo.cpp
similarity index 100%
rename from etk/typeInfo.cpp
rename to etk-core/typeInfo.cpp
diff --git a/etk/typeInfo.hpp b/etk-core/typeInfo.hpp
similarity index 100%
rename from etk/typeInfo.hpp
rename to etk-core/typeInfo.hpp
diff --git a/etk/typeTrait.hpp b/etk-core/typeTrait.hpp
similarity index 100%
rename from etk/typeTrait.hpp
rename to etk-core/typeTrait.hpp
diff --git a/etk/types.hpp b/etk-core/types.hpp
similarity index 100%
rename from etk/types.hpp
rename to etk-core/types.hpp
diff --git a/etk/utf8.cpp b/etk-core/utf8.cpp
similarity index 100%
rename from etk/utf8.cpp
rename to etk-core/utf8.cpp
diff --git a/etk/utf8.hpp b/etk-core/utf8.hpp
similarity index 100%
rename from etk/utf8.hpp
rename to etk-core/utf8.hpp
diff --git a/lutin_etk-base.py b/lutin_etk-core.py
similarity index 50%
rename from lutin_etk-base.py
rename to lutin_etk-core.py
index 6f3f1b4..a2c0d7e 100644
--- a/lutin_etk-base.py
+++ b/lutin_etk-core.py
@@ -28,38 +28,38 @@ def configure(target, my_module):
 	my_module.add_extra_flags()
 	# add the file to compile:
 	my_module.add_src_file([
-	    'etk/String.cpp',
-	    'etk/UString.cpp',
-	    'etk/utf8.cpp',
-	    'etk/stdTools.cpp',
-	    'etk/Stream.cpp',
-	    'etk/Function.cpp',
-	    'etk/Allocator.cpp',
-	    'etk/typeInfo.cpp',
-	    'etk/Exception.cpp',
+	    'etk-core/String.cpp',
+	    'etk-core/UString.cpp',
+	    'etk-core/utf8.cpp',
+	    'etk-core/stdTools.cpp',
+	    'etk-core/Stream.cpp',
+	    'etk-core/Function.cpp',
+	    'etk-core/Allocator.cpp',
+	    'etk-core/typeInfo.cpp',
+	    'etk-core/Exception.cpp',
 	    ])
 	
 	my_module.add_header_file([
-	    'etk/Allocator.hpp',
-	    'etk/types.hpp',
-	    'etk/stdTools.hpp',
-	    'etk/Buffer.hpp',
-	    'etk/String.hpp',
-	    'etk/UString.hpp',
-	    'etk/utf8.hpp',
-	    'etk/Array.hpp',
-	    'etk/Vector.hpp',
-	    'etk/Stream.hpp',
-	    'etk/Pair.hpp',
-	    'etk/Map.hpp',
-	    'etk/Set.hpp',
-	    'etk/move.hpp',
-	    'etk/typeTrait.hpp',
-	    'etk/Function.hpp',
-	    'etk/NullPtr.hpp',
-	    'etk/typeInfo.hpp',
-	    'etk/Exception.hpp'
-	    ])
+	    'etk-core/Allocator.hpp',
+	    'etk-core/types.hpp',
+	    'etk-core/stdTools.hpp',
+	    'etk-core/Buffer.hpp',
+	    'etk-core/String.hpp',
+	    'etk-core/UString.hpp',
+	    'etk-core/utf8.hpp',
+	    'etk-core/Array.hpp',
+	    'etk-core/Vector.hpp',
+	    'etk-core/Stream.hpp',
+	    'etk-core/Pair.hpp',
+	    'etk-core/Map.hpp',
+	    'etk-core/Set.hpp',
+	    'etk-core/move.hpp',
+	    'etk-core/typeTrait.hpp',
+	    'etk-core/Function.hpp',
+	    'etk-core/NullPtr.hpp',
+	    'etk-core/typeInfo.hpp',
+	    'etk-core/Exception.hpp'
+	    ], 'etk')
 	
 	# build in C++ mode
 	my_module.compile_version("c++", 2017)
@@ -73,7 +73,7 @@ def configure(target, my_module):
 	if "Android" in target.get_type():
 		my_module.add_depend("SDK")
 	if "MacOs" in target.get_type():
-                my_module.add_depend("cxx")
+		my_module.add_depend("cxx")
 	my_module.add_path(".")
 	return True