diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index d02663469..06ff11dc3 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -247,6 +247,7 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   OPTION(WITH_INSTALL_LIBRARIES   "Install development files."                    ON )
 
   OPTION(WITH_ASSIMP              "Use assimp exporter"                           OFF)
+  OPTION(WITH_LIBGSF              "Use libgsf for max file library"               OFF)
 
   ###
   # GUI toolkits
diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt
index 08fd9e776..17b22e3cc 100644
--- a/code/nel/tools/3d/CMakeLists.txt
+++ b/code/nel/tools/3d/CMakeLists.txt
@@ -6,6 +6,12 @@ IF(WITH_NEL_TOOLS)
         mesh_utils
         mesh_export)
     ENDIF()
+    IF(WITH_LIBGSF)
+      SUBDIRS(
+        pipeline_max
+        pipeline_max_dump
+        pipeline_max_rewrite_assets)
+    ENDIF()
     SUBDIRS(
       anim_builder
       animation_set_builder
diff --git a/code/nel/tools/pipeline/max/CMakeLists.txt b/code/nel/tools/3d/pipeline_max/CMakeLists.txt
similarity index 93%
rename from code/nel/tools/pipeline/max/CMakeLists.txt
rename to code/nel/tools/3d/pipeline_max/CMakeLists.txt
index 8d34c6647..f80176150 100644
--- a/code/nel/tools/pipeline/max/CMakeLists.txt
+++ b/code/nel/tools/3d/pipeline_max/CMakeLists.txt
@@ -30,7 +30,7 @@ TARGET_LINK_LIBRARIES(pipeline_max
 
 SET_TARGET_PROPERTIES(pipeline_max PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
-NL_DEFAULT_PROPS(pipeline_max "NeL, Tools, Pipeline: Max (Library)")
+NL_DEFAULT_PROPS(pipeline_max "NeL, Tools, 3D: Pipeline Max (Library)")
 NL_ADD_LIB_SUFFIX(pipeline_max)
 NL_ADD_RUNTIME_FLAGS(pipeline_max)
 
diff --git a/code/nel/tools/pipeline/max/builtin/animatable.cpp b/code/nel/tools/3d/pipeline_max/builtin/animatable.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/animatable.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/animatable.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/animatable.h b/code/nel/tools/3d/pipeline_max/builtin/animatable.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/animatable.h
rename to code/nel/tools/3d/pipeline_max/builtin/animatable.h
diff --git a/code/nel/tools/pipeline/max/builtin/base_object.cpp b/code/nel/tools/3d/pipeline_max/builtin/base_object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/base_object.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/base_object.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/base_object.h b/code/nel/tools/3d/pipeline_max/builtin/base_object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/base_object.h
rename to code/nel/tools/3d/pipeline_max/builtin/base_object.h
diff --git a/code/nel/tools/pipeline/max/builtin/bitmap_tex.cpp b/code/nel/tools/3d/pipeline_max/builtin/bitmap_tex.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/bitmap_tex.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/bitmap_tex.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/bitmap_tex.h b/code/nel/tools/3d/pipeline_max/builtin/bitmap_tex.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/bitmap_tex.h
rename to code/nel/tools/3d/pipeline_max/builtin/bitmap_tex.h
diff --git a/code/nel/tools/pipeline/max/builtin/builtin.cpp b/code/nel/tools/3d/pipeline_max/builtin/builtin.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/builtin.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/builtin.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/builtin.h b/code/nel/tools/3d/pipeline_max/builtin/builtin.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/builtin.h
rename to code/nel/tools/3d/pipeline_max/builtin/builtin.h
diff --git a/code/nel/tools/pipeline/max/builtin/editable_patch.cpp b/code/nel/tools/3d/pipeline_max/builtin/editable_patch.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/editable_patch.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/editable_patch.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/editable_patch.h b/code/nel/tools/3d/pipeline_max/builtin/editable_patch.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/editable_patch.h
rename to code/nel/tools/3d/pipeline_max/builtin/editable_patch.h
diff --git a/code/nel/tools/pipeline/max/builtin/geom_object.cpp b/code/nel/tools/3d/pipeline_max/builtin/geom_object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/geom_object.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/geom_object.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/geom_object.h b/code/nel/tools/3d/pipeline_max/builtin/geom_object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/geom_object.h
rename to code/nel/tools/3d/pipeline_max/builtin/geom_object.h
diff --git a/code/nel/tools/pipeline/max/builtin/i_node.cpp b/code/nel/tools/3d/pipeline_max/builtin/i_node.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/i_node.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/i_node.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/i_node.h b/code/nel/tools/3d/pipeline_max/builtin/i_node.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/i_node.h
rename to code/nel/tools/3d/pipeline_max/builtin/i_node.h
diff --git a/code/nel/tools/pipeline/max/builtin/modifier.cpp b/code/nel/tools/3d/pipeline_max/builtin/modifier.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/modifier.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/modifier.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/modifier.h b/code/nel/tools/3d/pipeline_max/builtin/modifier.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/modifier.h
rename to code/nel/tools/3d/pipeline_max/builtin/modifier.h
diff --git a/code/nel/tools/pipeline/max/builtin/mtl.cpp b/code/nel/tools/3d/pipeline_max/builtin/mtl.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/mtl.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/mtl.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/mtl.h b/code/nel/tools/3d/pipeline_max/builtin/mtl.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/mtl.h
rename to code/nel/tools/3d/pipeline_max/builtin/mtl.h
diff --git a/code/nel/tools/pipeline/max/builtin/mtl_base.cpp b/code/nel/tools/3d/pipeline_max/builtin/mtl_base.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/mtl_base.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/mtl_base.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/mtl_base.h b/code/nel/tools/3d/pipeline_max/builtin/mtl_base.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/mtl_base.h
rename to code/nel/tools/3d/pipeline_max/builtin/mtl_base.h
diff --git a/code/nel/tools/pipeline/max/builtin/multi_mtl.cpp b/code/nel/tools/3d/pipeline_max/builtin/multi_mtl.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/multi_mtl.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/multi_mtl.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/multi_mtl.h b/code/nel/tools/3d/pipeline_max/builtin/multi_mtl.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/multi_mtl.h
rename to code/nel/tools/3d/pipeline_max/builtin/multi_mtl.h
diff --git a/code/nel/tools/pipeline/max/builtin/node_impl.cpp b/code/nel/tools/3d/pipeline_max/builtin/node_impl.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/node_impl.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/node_impl.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/node_impl.h b/code/nel/tools/3d/pipeline_max/builtin/node_impl.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/node_impl.h
rename to code/nel/tools/3d/pipeline_max/builtin/node_impl.h
diff --git a/code/nel/tools/pipeline/max/builtin/object.cpp b/code/nel/tools/3d/pipeline_max/builtin/object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/object.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/object.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/object.h b/code/nel/tools/3d/pipeline_max/builtin/object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/object.h
rename to code/nel/tools/3d/pipeline_max/builtin/object.h
diff --git a/code/nel/tools/pipeline/max/builtin/param_block.cpp b/code/nel/tools/3d/pipeline_max/builtin/param_block.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/param_block.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/param_block.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/param_block.h b/code/nel/tools/3d/pipeline_max/builtin/param_block.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/param_block.h
rename to code/nel/tools/3d/pipeline_max/builtin/param_block.h
diff --git a/code/nel/tools/pipeline/max/builtin/param_block_2.cpp b/code/nel/tools/3d/pipeline_max/builtin/param_block_2.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/param_block_2.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/param_block_2.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/param_block_2.h b/code/nel/tools/3d/pipeline_max/builtin/param_block_2.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/param_block_2.h
rename to code/nel/tools/3d/pipeline_max/builtin/param_block_2.h
diff --git a/code/nel/tools/pipeline/max/builtin/patch_object.cpp b/code/nel/tools/3d/pipeline_max/builtin/patch_object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/patch_object.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/patch_object.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/patch_object.h b/code/nel/tools/3d/pipeline_max/builtin/patch_object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/patch_object.h
rename to code/nel/tools/3d/pipeline_max/builtin/patch_object.h
diff --git a/code/nel/tools/pipeline/max/builtin/poly_object.cpp b/code/nel/tools/3d/pipeline_max/builtin/poly_object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/poly_object.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/poly_object.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/poly_object.h b/code/nel/tools/3d/pipeline_max/builtin/poly_object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/poly_object.h
rename to code/nel/tools/3d/pipeline_max/builtin/poly_object.h
diff --git a/code/nel/tools/pipeline/max/builtin/reference_maker.cpp b/code/nel/tools/3d/pipeline_max/builtin/reference_maker.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/reference_maker.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/reference_maker.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/reference_maker.h b/code/nel/tools/3d/pipeline_max/builtin/reference_maker.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/reference_maker.h
rename to code/nel/tools/3d/pipeline_max/builtin/reference_maker.h
diff --git a/code/nel/tools/pipeline/max/builtin/reference_target.cpp b/code/nel/tools/3d/pipeline_max/builtin/reference_target.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/reference_target.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/reference_target.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/reference_target.h b/code/nel/tools/3d/pipeline_max/builtin/reference_target.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/reference_target.h
rename to code/nel/tools/3d/pipeline_max/builtin/reference_target.h
diff --git a/code/nel/tools/pipeline/max/builtin/root_node.cpp b/code/nel/tools/3d/pipeline_max/builtin/root_node.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/root_node.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/root_node.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/root_node.h b/code/nel/tools/3d/pipeline_max/builtin/root_node.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/root_node.h
rename to code/nel/tools/3d/pipeline_max/builtin/root_node.h
diff --git a/code/nel/tools/pipeline/max/builtin/scene_impl.cpp b/code/nel/tools/3d/pipeline_max/builtin/scene_impl.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/scene_impl.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/scene_impl.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/scene_impl.h b/code/nel/tools/3d/pipeline_max/builtin/scene_impl.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/scene_impl.h
rename to code/nel/tools/3d/pipeline_max/builtin/scene_impl.h
diff --git a/code/nel/tools/pipeline/max/builtin/std_mat.cpp b/code/nel/tools/3d/pipeline_max/builtin/std_mat.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/std_mat.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/std_mat.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/std_mat.h b/code/nel/tools/3d/pipeline_max/builtin/std_mat.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/std_mat.h
rename to code/nel/tools/3d/pipeline_max/builtin/std_mat.h
diff --git a/code/nel/tools/pipeline/max/builtin/std_mat_2.cpp b/code/nel/tools/3d/pipeline_max/builtin/std_mat_2.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/std_mat_2.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/std_mat_2.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/std_mat_2.h b/code/nel/tools/3d/pipeline_max/builtin/std_mat_2.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/std_mat_2.h
rename to code/nel/tools/3d/pipeline_max/builtin/std_mat_2.h
diff --git a/code/nel/tools/pipeline/max/builtin/storage/app_data.cpp b/code/nel/tools/3d/pipeline_max/builtin/storage/app_data.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/storage/app_data.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/storage/app_data.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/storage/app_data.h b/code/nel/tools/3d/pipeline_max/builtin/storage/app_data.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/storage/app_data.h
rename to code/nel/tools/3d/pipeline_max/builtin/storage/app_data.h
diff --git a/code/nel/tools/pipeline/max/builtin/storage/geom_buffers.cpp b/code/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/storage/geom_buffers.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/storage/geom_buffers.h b/code/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/storage/geom_buffers.h
rename to code/nel/tools/3d/pipeline_max/builtin/storage/geom_buffers.h
diff --git a/code/nel/tools/pipeline/max/builtin/super_class_unknown.cpp b/code/nel/tools/3d/pipeline_max/builtin/super_class_unknown.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/super_class_unknown.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/super_class_unknown.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/super_class_unknown.h b/code/nel/tools/3d/pipeline_max/builtin/super_class_unknown.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/super_class_unknown.h
rename to code/nel/tools/3d/pipeline_max/builtin/super_class_unknown.h
diff --git a/code/nel/tools/pipeline/max/builtin/texmap.cpp b/code/nel/tools/3d/pipeline_max/builtin/texmap.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/texmap.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/texmap.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/texmap.h b/code/nel/tools/3d/pipeline_max/builtin/texmap.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/texmap.h
rename to code/nel/tools/3d/pipeline_max/builtin/texmap.h
diff --git a/code/nel/tools/pipeline/max/builtin/track_view_node.cpp b/code/nel/tools/3d/pipeline_max/builtin/track_view_node.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/track_view_node.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/track_view_node.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/track_view_node.h b/code/nel/tools/3d/pipeline_max/builtin/track_view_node.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/track_view_node.h
rename to code/nel/tools/3d/pipeline_max/builtin/track_view_node.h
diff --git a/code/nel/tools/pipeline/max/builtin/tri_object.cpp b/code/nel/tools/3d/pipeline_max/builtin/tri_object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/tri_object.cpp
rename to code/nel/tools/3d/pipeline_max/builtin/tri_object.cpp
diff --git a/code/nel/tools/pipeline/max/builtin/tri_object.h b/code/nel/tools/3d/pipeline_max/builtin/tri_object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/builtin/tri_object.h
rename to code/nel/tools/3d/pipeline_max/builtin/tri_object.h
diff --git a/code/nel/tools/pipeline/max/class_data.cpp b/code/nel/tools/3d/pipeline_max/class_data.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/class_data.cpp
rename to code/nel/tools/3d/pipeline_max/class_data.cpp
diff --git a/code/nel/tools/pipeline/max/class_data.h b/code/nel/tools/3d/pipeline_max/class_data.h
similarity index 100%
rename from code/nel/tools/pipeline/max/class_data.h
rename to code/nel/tools/3d/pipeline_max/class_data.h
diff --git a/code/nel/tools/pipeline/max/class_directory_3.cpp b/code/nel/tools/3d/pipeline_max/class_directory_3.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/class_directory_3.cpp
rename to code/nel/tools/3d/pipeline_max/class_directory_3.cpp
diff --git a/code/nel/tools/pipeline/max/class_directory_3.h b/code/nel/tools/3d/pipeline_max/class_directory_3.h
similarity index 100%
rename from code/nel/tools/pipeline/max/class_directory_3.h
rename to code/nel/tools/3d/pipeline_max/class_directory_3.h
diff --git a/code/nel/tools/pipeline/max/config.cpp b/code/nel/tools/3d/pipeline_max/config.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/config.cpp
rename to code/nel/tools/3d/pipeline_max/config.cpp
diff --git a/code/nel/tools/pipeline/max/config.h b/code/nel/tools/3d/pipeline_max/config.h
similarity index 100%
rename from code/nel/tools/pipeline/max/config.h
rename to code/nel/tools/3d/pipeline_max/config.h
diff --git a/code/nel/tools/pipeline/max/derived_object.cpp b/code/nel/tools/3d/pipeline_max/derived_object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/derived_object.cpp
rename to code/nel/tools/3d/pipeline_max/derived_object.cpp
diff --git a/code/nel/tools/pipeline/max/derived_object.h b/code/nel/tools/3d/pipeline_max/derived_object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/derived_object.h
rename to code/nel/tools/3d/pipeline_max/derived_object.h
diff --git a/code/nel/tools/pipeline/max/dll_directory.cpp b/code/nel/tools/3d/pipeline_max/dll_directory.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/dll_directory.cpp
rename to code/nel/tools/3d/pipeline_max/dll_directory.cpp
diff --git a/code/nel/tools/pipeline/max/dll_directory.h b/code/nel/tools/3d/pipeline_max/dll_directory.h
similarity index 100%
rename from code/nel/tools/pipeline/max/dll_directory.h
rename to code/nel/tools/3d/pipeline_max/dll_directory.h
diff --git a/code/nel/tools/pipeline/max/dll_plugin_desc.cpp b/code/nel/tools/3d/pipeline_max/dll_plugin_desc.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/dll_plugin_desc.cpp
rename to code/nel/tools/3d/pipeline_max/dll_plugin_desc.cpp
diff --git a/code/nel/tools/pipeline/max/dll_plugin_desc.h b/code/nel/tools/3d/pipeline_max/dll_plugin_desc.h
similarity index 100%
rename from code/nel/tools/pipeline/max/dll_plugin_desc.h
rename to code/nel/tools/3d/pipeline_max/dll_plugin_desc.h
diff --git a/code/nel/tools/pipeline/max/epoly/editable_poly.cpp b/code/nel/tools/3d/pipeline_max/epoly/editable_poly.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/epoly/editable_poly.cpp
rename to code/nel/tools/3d/pipeline_max/epoly/editable_poly.cpp
diff --git a/code/nel/tools/pipeline/max/epoly/editable_poly.h b/code/nel/tools/3d/pipeline_max/epoly/editable_poly.h
similarity index 100%
rename from code/nel/tools/pipeline/max/epoly/editable_poly.h
rename to code/nel/tools/3d/pipeline_max/epoly/editable_poly.h
diff --git a/code/nel/tools/pipeline/max/epoly/epoly.cpp b/code/nel/tools/3d/pipeline_max/epoly/epoly.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/epoly/epoly.cpp
rename to code/nel/tools/3d/pipeline_max/epoly/epoly.cpp
diff --git a/code/nel/tools/pipeline/max/epoly/epoly.h b/code/nel/tools/3d/pipeline_max/epoly/epoly.h
similarity index 100%
rename from code/nel/tools/pipeline/max/epoly/epoly.h
rename to code/nel/tools/3d/pipeline_max/epoly/epoly.h
diff --git a/code/nel/tools/pipeline/max/scene.cpp b/code/nel/tools/3d/pipeline_max/scene.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/scene.cpp
rename to code/nel/tools/3d/pipeline_max/scene.cpp
diff --git a/code/nel/tools/pipeline/max/scene.h b/code/nel/tools/3d/pipeline_max/scene.h
similarity index 100%
rename from code/nel/tools/pipeline/max/scene.h
rename to code/nel/tools/3d/pipeline_max/scene.h
diff --git a/code/nel/tools/pipeline/max/scene_class.cpp b/code/nel/tools/3d/pipeline_max/scene_class.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/scene_class.cpp
rename to code/nel/tools/3d/pipeline_max/scene_class.cpp
diff --git a/code/nel/tools/pipeline/max/scene_class.h b/code/nel/tools/3d/pipeline_max/scene_class.h
similarity index 100%
rename from code/nel/tools/pipeline/max/scene_class.h
rename to code/nel/tools/3d/pipeline_max/scene_class.h
diff --git a/code/nel/tools/pipeline/max/scene_class_registry.cpp b/code/nel/tools/3d/pipeline_max/scene_class_registry.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/scene_class_registry.cpp
rename to code/nel/tools/3d/pipeline_max/scene_class_registry.cpp
diff --git a/code/nel/tools/pipeline/max/scene_class_registry.h b/code/nel/tools/3d/pipeline_max/scene_class_registry.h
similarity index 100%
rename from code/nel/tools/pipeline/max/scene_class_registry.h
rename to code/nel/tools/3d/pipeline_max/scene_class_registry.h
diff --git a/code/nel/tools/pipeline/max/scene_class_unknown.cpp b/code/nel/tools/3d/pipeline_max/scene_class_unknown.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/scene_class_unknown.cpp
rename to code/nel/tools/3d/pipeline_max/scene_class_unknown.cpp
diff --git a/code/nel/tools/pipeline/max/scene_class_unknown.h b/code/nel/tools/3d/pipeline_max/scene_class_unknown.h
similarity index 100%
rename from code/nel/tools/pipeline/max/scene_class_unknown.h
rename to code/nel/tools/3d/pipeline_max/scene_class_unknown.h
diff --git a/code/nel/tools/pipeline/max/storage_array.cpp b/code/nel/tools/3d/pipeline_max/storage_array.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_array.cpp
rename to code/nel/tools/3d/pipeline_max/storage_array.cpp
diff --git a/code/nel/tools/pipeline/max/storage_array.h b/code/nel/tools/3d/pipeline_max/storage_array.h
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_array.h
rename to code/nel/tools/3d/pipeline_max/storage_array.h
diff --git a/code/nel/tools/pipeline/max/storage_chunks.cpp b/code/nel/tools/3d/pipeline_max/storage_chunks.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_chunks.cpp
rename to code/nel/tools/3d/pipeline_max/storage_chunks.cpp
diff --git a/code/nel/tools/pipeline/max/storage_chunks.h b/code/nel/tools/3d/pipeline_max/storage_chunks.h
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_chunks.h
rename to code/nel/tools/3d/pipeline_max/storage_chunks.h
diff --git a/code/nel/tools/pipeline/max/storage_file.cpp b/code/nel/tools/3d/pipeline_max/storage_file.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_file.cpp
rename to code/nel/tools/3d/pipeline_max/storage_file.cpp
diff --git a/code/nel/tools/pipeline/max/storage_file.h b/code/nel/tools/3d/pipeline_max/storage_file.h
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_file.h
rename to code/nel/tools/3d/pipeline_max/storage_file.h
diff --git a/code/nel/tools/pipeline/max/storage_object.cpp b/code/nel/tools/3d/pipeline_max/storage_object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_object.cpp
rename to code/nel/tools/3d/pipeline_max/storage_object.cpp
diff --git a/code/nel/tools/pipeline/max/storage_object.h b/code/nel/tools/3d/pipeline_max/storage_object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_object.h
rename to code/nel/tools/3d/pipeline_max/storage_object.h
diff --git a/code/nel/tools/pipeline/max/storage_stream.cpp b/code/nel/tools/3d/pipeline_max/storage_stream.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_stream.cpp
rename to code/nel/tools/3d/pipeline_max/storage_stream.cpp
diff --git a/code/nel/tools/pipeline/max/storage_stream.h b/code/nel/tools/3d/pipeline_max/storage_stream.h
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_stream.h
rename to code/nel/tools/3d/pipeline_max/storage_stream.h
diff --git a/code/nel/tools/pipeline/max/storage_value.cpp b/code/nel/tools/3d/pipeline_max/storage_value.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_value.cpp
rename to code/nel/tools/3d/pipeline_max/storage_value.cpp
diff --git a/code/nel/tools/pipeline/max/storage_value.h b/code/nel/tools/3d/pipeline_max/storage_value.h
similarity index 100%
rename from code/nel/tools/pipeline/max/storage_value.h
rename to code/nel/tools/3d/pipeline_max/storage_value.h
diff --git a/code/nel/tools/pipeline/max/super_class_desc.cpp b/code/nel/tools/3d/pipeline_max/super_class_desc.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/super_class_desc.cpp
rename to code/nel/tools/3d/pipeline_max/super_class_desc.cpp
diff --git a/code/nel/tools/pipeline/max/super_class_desc.h b/code/nel/tools/3d/pipeline_max/super_class_desc.h
similarity index 100%
rename from code/nel/tools/pipeline/max/super_class_desc.h
rename to code/nel/tools/3d/pipeline_max/super_class_desc.h
diff --git a/code/nel/tools/pipeline/max/typedefs.cpp b/code/nel/tools/3d/pipeline_max/typedefs.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/typedefs.cpp
rename to code/nel/tools/3d/pipeline_max/typedefs.cpp
diff --git a/code/nel/tools/pipeline/max/typedefs.h b/code/nel/tools/3d/pipeline_max/typedefs.h
similarity index 100%
rename from code/nel/tools/pipeline/max/typedefs.h
rename to code/nel/tools/3d/pipeline_max/typedefs.h
diff --git a/code/nel/tools/pipeline/max/update1/editable_mesh.cpp b/code/nel/tools/3d/pipeline_max/update1/editable_mesh.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/update1/editable_mesh.cpp
rename to code/nel/tools/3d/pipeline_max/update1/editable_mesh.cpp
diff --git a/code/nel/tools/pipeline/max/update1/editable_mesh.h b/code/nel/tools/3d/pipeline_max/update1/editable_mesh.h
similarity index 100%
rename from code/nel/tools/pipeline/max/update1/editable_mesh.h
rename to code/nel/tools/3d/pipeline_max/update1/editable_mesh.h
diff --git a/code/nel/tools/pipeline/max/update1/update1.cpp b/code/nel/tools/3d/pipeline_max/update1/update1.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/update1/update1.cpp
rename to code/nel/tools/3d/pipeline_max/update1/update1.cpp
diff --git a/code/nel/tools/pipeline/max/update1/update1.h b/code/nel/tools/3d/pipeline_max/update1/update1.h
similarity index 100%
rename from code/nel/tools/pipeline/max/update1/update1.h
rename to code/nel/tools/3d/pipeline_max/update1/update1.h
diff --git a/code/nel/tools/pipeline/max/wsm_derived_object.cpp b/code/nel/tools/3d/pipeline_max/wsm_derived_object.cpp
similarity index 100%
rename from code/nel/tools/pipeline/max/wsm_derived_object.cpp
rename to code/nel/tools/3d/pipeline_max/wsm_derived_object.cpp
diff --git a/code/nel/tools/pipeline/max/wsm_derived_object.h b/code/nel/tools/3d/pipeline_max/wsm_derived_object.h
similarity index 100%
rename from code/nel/tools/pipeline/max/wsm_derived_object.h
rename to code/nel/tools/3d/pipeline_max/wsm_derived_object.h
diff --git a/code/nel/tools/pipeline/max_dump/CMakeLists.txt b/code/nel/tools/3d/pipeline_max_dump/CMakeLists.txt
similarity index 88%
rename from code/nel/tools/pipeline/max_dump/CMakeLists.txt
rename to code/nel/tools/3d/pipeline_max_dump/CMakeLists.txt
index 742d5684e..d079d9000 100644
--- a/code/nel/tools/pipeline/max_dump/CMakeLists.txt
+++ b/code/nel/tools/3d/pipeline_max_dump/CMakeLists.txt
@@ -29,7 +29,7 @@ TARGET_LINK_LIBRARIES(pipeline_max_dump
 	nelmisc
 )
 
-NL_DEFAULT_PROPS(pipeline_max_dump "NeL, Tools, Pipeline: Max Dump (Temporary Tool)")
+NL_DEFAULT_PROPS(pipeline_max_dump "NeL, Tools, 3D: Pipeline Max Dump (Temporary Tool)")
 NL_ADD_RUNTIME_FLAGS(pipeline_max_dump)
 
 INSTALL(TARGETS pipeline_max_dump RUNTIME DESTINATION bin COMPONENT toolsmisc)
diff --git a/code/nel/tools/pipeline/max_dump/class_directory_3_2010.c b/code/nel/tools/3d/pipeline_max_dump/class_directory_3_2010.c
similarity index 100%
rename from code/nel/tools/pipeline/max_dump/class_directory_3_2010.c
rename to code/nel/tools/3d/pipeline_max_dump/class_directory_3_2010.c
diff --git a/code/nel/tools/pipeline/max_dump/class_directory_3_3.c b/code/nel/tools/3d/pipeline_max_dump/class_directory_3_3.c
similarity index 100%
rename from code/nel/tools/pipeline/max_dump/class_directory_3_3.c
rename to code/nel/tools/3d/pipeline_max_dump/class_directory_3_3.c
diff --git a/code/nel/tools/pipeline/max_dump/config_2010.c b/code/nel/tools/3d/pipeline_max_dump/config_2010.c
similarity index 100%
rename from code/nel/tools/pipeline/max_dump/config_2010.c
rename to code/nel/tools/3d/pipeline_max_dump/config_2010.c
diff --git a/code/nel/tools/pipeline/max_dump/config_2010.txt b/code/nel/tools/3d/pipeline_max_dump/config_2010.txt
similarity index 100%
rename from code/nel/tools/pipeline/max_dump/config_2010.txt
rename to code/nel/tools/3d/pipeline_max_dump/config_2010.txt
diff --git a/code/nel/tools/pipeline/max_dump/config_3.c b/code/nel/tools/3d/pipeline_max_dump/config_3.c
similarity index 100%
rename from code/nel/tools/pipeline/max_dump/config_3.c
rename to code/nel/tools/3d/pipeline_max_dump/config_3.c
diff --git a/code/nel/tools/pipeline/max_dump/info.txt b/code/nel/tools/3d/pipeline_max_dump/info.txt
similarity index 100%
rename from code/nel/tools/pipeline/max_dump/info.txt
rename to code/nel/tools/3d/pipeline_max_dump/info.txt
diff --git a/code/nel/tools/pipeline/max_dump/main.cpp b/code/nel/tools/3d/pipeline_max_dump/main.cpp
similarity index 93%
rename from code/nel/tools/pipeline/max_dump/main.cpp
rename to code/nel/tools/3d/pipeline_max_dump/main.cpp
index 3c873e5bc..58c366831 100644
--- a/code/nel/tools/pipeline/max_dump/main.cpp
+++ b/code/nel/tools/3d/pipeline_max_dump/main.cpp
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2012  by Jan Boon (Kaetemi)
+ *
+ * This file is part of RYZOM CORE PIPELINE.
+ * RYZOM CORE PIPELINE is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * RYZOM CORE PIPELINE is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE PIPELINE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
 
 #include <nel/misc/types_nl.h>
 #include <nel/misc/common.h>
diff --git a/code/nel/tools/pipeline/max_dump/scene_2010.c b/code/nel/tools/3d/pipeline_max_dump/scene_2010.c
similarity index 100%
rename from code/nel/tools/pipeline/max_dump/scene_2010.c
rename to code/nel/tools/3d/pipeline_max_dump/scene_2010.c
diff --git a/code/nel/tools/pipeline/max_dump/scene_graph_5.txt b/code/nel/tools/3d/pipeline_max_dump/scene_graph_5.txt
similarity index 100%
rename from code/nel/tools/pipeline/max_dump/scene_graph_5.txt
rename to code/nel/tools/3d/pipeline_max_dump/scene_graph_5.txt
diff --git a/code/nel/tools/pipeline/max_rewrite_assets/CMakeLists.txt b/code/nel/tools/3d/pipeline_max_rewrite_assets/CMakeLists.txt
similarity index 89%
rename from code/nel/tools/pipeline/max_rewrite_assets/CMakeLists.txt
rename to code/nel/tools/3d/pipeline_max_rewrite_assets/CMakeLists.txt
index 9a5eb7d91..4aa8a6652 100644
--- a/code/nel/tools/pipeline/max_rewrite_assets/CMakeLists.txt
+++ b/code/nel/tools/3d/pipeline_max_rewrite_assets/CMakeLists.txt
@@ -29,7 +29,7 @@ TARGET_LINK_LIBRARIES(pipeline_max_rewrite_assets
 	nelmisc
 )
 
-NL_DEFAULT_PROPS(pipeline_max_dump "NeL, Tools, Pipeline: Max Rewrite Assets")
+NL_DEFAULT_PROPS(pipeline_max_dump "NeL, Tools, 3D: Pipeline Max Rewrite Assets")
 NL_ADD_RUNTIME_FLAGS(pipeline_max_rewrite_assets)
 
 INSTALL(TARGETS pipeline_max_rewrite_assets RUNTIME DESTINATION bin COMPONENT toolsmisc)
diff --git a/code/nel/tools/pipeline/max_rewrite_assets/main.cpp b/code/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp
similarity index 98%
rename from code/nel/tools/pipeline/max_rewrite_assets/main.cpp
rename to code/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp
index 45f723026..4a7aca040 100644
--- a/code/nel/tools/pipeline/max_rewrite_assets/main.cpp
+++ b/code/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp
@@ -1,4 +1,22 @@
-
+/*
+ * Copyright (C) 2012  by Jan Boon (Kaetemi)
+ *
+ * This file is part of RYZOM CORE PIPELINE.
+ * RYZOM CORE PIPELINE is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * RYZOM CORE PIPELINE is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE PIPELINE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+ 
 #include <nel/misc/types_nl.h>
 #include <nel/misc/common.h>
 
diff --git a/code/nel/tools/pipeline/CMakeLists.txt b/code/nel/tools/pipeline/CMakeLists.txt
index decf893d0..0e3913ad1 100644
--- a/code/nel/tools/pipeline/CMakeLists.txt
+++ b/code/nel/tools/pipeline/CMakeLists.txt
@@ -1,4 +1,2 @@
 SUBDIRS(
-		max
-		max_dump
-		max_rewrite_assets)
+)