diff --git a/vcg/complex/algorithms/attribute_seam.h b/vcg/complex/algorithms/attribute_seam.h
index 1f4f3366..b8646d0e 100644
--- a/vcg/complex/algorithms/attribute_seam.h
+++ b/vcg/complex/algorithms/attribute_seam.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <vcg/complex/trimesh/allocate.h>
+#include <vcg/complex/allocate.h>
 
 /*
 
diff --git a/vcg/complex/algorithms/autoalign_4pcs.h b/vcg/complex/algorithms/autoalign_4pcs.h
index fac74aec..7bacda33 100644
--- a/vcg/complex/algorithms/autoalign_4pcs.h
+++ b/vcg/complex/algorithms/autoalign_4pcs.h
@@ -38,13 +38,13 @@ used in the paper pseudocode.
 #include <vcg/math/matrix44.h>
 
 #include <vcg/space/index/grid_static_ptr.h>
-#include <vcg/complex/trimesh/closest.h>
-#include <vcg/complex/trimesh/update/bounding.h>
+#include <vcg/complex/algorithms/closest.h>
+#include <vcg/complex/algorithms/update/bounding.h>
 
 #include <vcg/simplex/vertex/base.h>
 #include <vcg/simplex/face/base.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/stat.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/stat.h>
 #include <wrap/io_trimesh/export_ply.h>
 
 
diff --git a/vcg/complex/algorithms/bitquad_creation.h b/vcg/complex/algorithms/bitquad_creation.h
index af25fd00..0261b14c 100644
--- a/vcg/complex/algorithms/bitquad_creation.h
+++ b/vcg/complex/algorithms/bitquad_creation.h
@@ -1,5 +1,5 @@
-#include <vcg/complex/trimesh/bitquad_support.h>
-#include <vcg/complex/trimesh/allocate.h>
+#include <vcg/complex/algorithms/bitquad_support.h>
+#include <vcg/complex/allocate.h>
 
 /** BIT-QUAD creation support:
     a collection of methods that,
diff --git a/vcg/complex/algorithms/bitquad_support.h b/vcg/complex/algorithms/bitquad_support.h
index e6c49d11..846988da 100644
--- a/vcg/complex/algorithms/bitquad_support.h
+++ b/vcg/complex/algorithms/bitquad_support.h
@@ -2,7 +2,7 @@
 #define VCG_BITQUAD_SUPPORT
 #include <vector>
 #include <set>
-#include <vcg/complex/trimesh/subset.h>
+#include <vcg/complex/algorithms/subset.h>
 #include <vcg/simplex/face/jumping_pos.h>
 #include <vcg/simplex/face/topology.h>
 #include <vcg/space/planar_polygon_tessellation.h>
diff --git a/vcg/complex/algorithms/clean.h b/vcg/complex/algorithms/clean.h
index 7a3dce83..3f5750ac 100644
--- a/vcg/complex/algorithms/clean.h
+++ b/vcg/complex/algorithms/clean.h
@@ -32,15 +32,15 @@
 // VCG headers
 #include <vcg/simplex/face/pos.h>
 #include <vcg/simplex/face/topology.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/closest.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/closest.h>
 #include <vcg/space/index/grid_static_ptr.h>
 #include <vcg/space/index/spatial_hashing.h>
-#include <vcg/complex/trimesh/allocate.h>
-#include <vcg/complex/trimesh/update/selection.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/topology.h>
+#include <vcg/complex/allocate.h>
+#include <vcg/complex/algorithms/update/selection.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/topology.h>
 #include <vcg/space/triangle3.h>
 
 
diff --git a/vcg/complex/algorithms/closest.h b/vcg/complex/algorithms/closest.h
index a603a684..c75d8e58 100644
--- a/vcg/complex/algorithms/closest.h
+++ b/vcg/complex/algorithms/closest.h
@@ -135,7 +135,7 @@ header added
 #include <vcg/simplex/vertex/distance.h>
 #include <vcg/space/intersection3.h>
 #include <vcg/space/index/space_iterators.h>
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 
 namespace vcg {
 	namespace tri {
diff --git a/vcg/complex/algorithms/clustering.h b/vcg/complex/algorithms/clustering.h
index 1a67a5b9..ed534ee0 100644
--- a/vcg/complex/algorithms/clustering.h
+++ b/vcg/complex/algorithms/clustering.h
@@ -62,10 +62,10 @@ First working Version
 #ifndef __VCGLIB_CLUSTERING
 #define __VCGLIB_CLUSTERING
 
-#include<vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/clean.h>
+#include<vcg/complex/complex.h>
+#include <vcg/complex/algorithms/clean.h>
 #include<vcg/space/triangle3.h>
-#include<vcg/complex/trimesh/update/topology.h>
+#include<vcg/complex/algorithms/update/topology.h>
 #include<vcg/space/index/grid_util.h>
 
 #include <iostream>
diff --git a/vcg/complex/algorithms/crease_cut.h b/vcg/complex/algorithms/crease_cut.h
index 572ea229..69df200c 100644
--- a/vcg/complex/algorithms/crease_cut.h
+++ b/vcg/complex/algorithms/crease_cut.h
@@ -24,8 +24,8 @@
 #ifndef __VCG_CREASE_CUT
 #define __VCG_CREASE_CUT
 #include<vcg/simplex/face/jumping_pos.h>
-#include<vcg/complex/trimesh/append.h>
-#include<vcg/complex/trimesh/update/normal.h>
+#include<vcg/complex/append.h>
+#include<vcg/complex/algorithms/update/normal.h>
 namespace vcg {
 namespace tri {
 	
diff --git a/vcg/complex/algorithms/create/advancing_front.h b/vcg/complex/algorithms/create/advancing_front.h
index a0689faf..80b6bf32 100644
--- a/vcg/complex/algorithms/create/advancing_front.h
+++ b/vcg/complex/algorithms/create/advancing_front.h
@@ -4,8 +4,8 @@
 #include <iostream>
 #include <list>
 #include <wrap/callback.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/flag.h>
 #include <map>
 
 namespace vcg {
diff --git a/vcg/complex/algorithms/create/ball_pivoting.h b/vcg/complex/algorithms/create/ball_pivoting.h
index 6f71693e..5a0e981c 100644
--- a/vcg/complex/algorithms/create/ball_pivoting.h
+++ b/vcg/complex/algorithms/create/ball_pivoting.h
@@ -3,7 +3,7 @@
 
 #include "advancing_front.h"
 #include <vcg/space/index/grid_static_ptr.h>
-#include <vcg/complex/trimesh/closest.h>
+#include <vcg/complex/algorithms/closest.h>
 
 /* Ball pivoting algorithm:
    1) the vertices used in the new mesh are marked as visited
diff --git a/vcg/complex/algorithms/create/extended_marching_cubes.h b/vcg/complex/algorithms/create/extended_marching_cubes.h
index b48c241f..504a6941 100644
--- a/vcg/complex/algorithms/create/extended_marching_cubes.h
+++ b/vcg/complex/algorithms/create/extended_marching_cubes.h
@@ -33,11 +33,11 @@
 #include <vcg/math/matrix.h>
 #include <vcg/math/lin_algebra.h>
 #include <vcg/simplex/face/topology.h>
-#include <vcg/complex/trimesh/update/edges.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/allocate.h>
-#include <vcg/complex/trimesh/clean.h>
+#include <vcg/complex/algorithms/update/edges.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/allocate.h>
+#include <vcg/complex/algorithms/clean.h>
 #include <vcg/space/point3.h>
 #include "emc_lookup_table.h"
 
diff --git a/vcg/complex/algorithms/create/marching_cubes.h b/vcg/complex/algorithms/create/marching_cubes.h
index 1d732ccc..08cd94b3 100644
--- a/vcg/complex/algorithms/create/marching_cubes.h
+++ b/vcg/complex/algorithms/create/marching_cubes.h
@@ -27,7 +27,7 @@
 
 #include <assert.h>
 #include <vcg/space/point3.h>
-#include <vcg/complex/trimesh/allocate.h>
+#include <vcg/complex/allocate.h>
 #include "mc_lookup_table.h"
 
 namespace vcg
diff --git a/vcg/complex/algorithms/create/platonic.h b/vcg/complex/algorithms/create/platonic.h
index 3030dc5e..13a674fb 100644
--- a/vcg/complex/algorithms/create/platonic.h
+++ b/vcg/complex/algorithms/create/platonic.h
@@ -25,9 +25,9 @@
 #define __VCGLIB_PLATONIC
 
 #include<vcg/math/base.h>
-#include<vcg/complex/trimesh/allocate.h>
-#include<vcg/complex/trimesh/refine.h>
-#include<vcg/complex/trimesh/update/flag.h>
+#include<vcg/complex/allocate.h>
+#include<vcg/complex/algorithms/refine.h>
+#include<vcg/complex/algorithms/update/flag.h>
 
 namespace vcg {
 namespace tri {
diff --git a/vcg/complex/algorithms/create/resampler.h b/vcg/complex/algorithms/create/resampler.h
index 4a22923c..dd7822b9 100644
--- a/vcg/complex/algorithms/create/resampler.h
+++ b/vcg/complex/algorithms/create/resampler.h
@@ -23,13 +23,13 @@
 #ifndef __VCG_MESH_RESAMPLER
 #define __VCG_MESH_RESAMPLER
 
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/edges.h>
-#include <vcg/complex/trimesh/create/marching_cubes.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/update/edges.h>
+#include <vcg/complex/algorithms/create/marching_cubes.h>
 #include <vcg/space/index/grid_static_ptr.h>
-#include <vcg/complex/trimesh/closest.h>
+#include <vcg/complex/algorithms/closest.h>
 #include <vcg/space/box3.h>
 
 namespace vcg {
diff --git a/vcg/complex/algorithms/edge_collapse.h b/vcg/complex/algorithms/edge_collapse.h
index afde69f8..070ff13d 100644
--- a/vcg/complex/algorithms/edge_collapse.h
+++ b/vcg/complex/algorithms/edge_collapse.h
@@ -44,7 +44,7 @@
 
 #include<vcg/simplex/face/pos.h>
 #include<vcg/simplex/face/topology.h>
-#include<vcg/complex/trimesh/allocate.h>
+#include<vcg/complex/allocate.h>
 
 namespace vcg{
 namespace tri{	
diff --git a/vcg/complex/algorithms/geodesic.h b/vcg/complex/algorithms/geodesic.h
index 4f4adc8e..4b20a469 100644
--- a/vcg/complex/algorithms/geodesic.h
+++ b/vcg/complex/algorithms/geodesic.h
@@ -39,7 +39,7 @@
 #include <vcg/container/simple_temporary_data.h>
 #include <vcg/simplex/face/pos.h>
 #include <vcg/simplex/face/topology.h>
-#include <vcg/complex/trimesh/update/quality.h>
+#include <vcg/complex/algorithms/update/quality.h>
 #include <deque>
 #include <vector>
 #include <list>
diff --git a/vcg/complex/algorithms/halfedge_quad_clean.h b/vcg/complex/algorithms/halfedge_quad_clean.h
index 0d2c5198..ec542e26 100755
--- a/vcg/complex/algorithms/halfedge_quad_clean.h
+++ b/vcg/complex/algorithms/halfedge_quad_clean.h
@@ -1,7 +1,7 @@
 #ifndef HALFEDGEQUADCLEAN_H
 #define HALFEDGEQUADCLEAN_H
 
-#include <vcg/complex/trimesh/update/halfedge_topology.h>
+#include <vcg/complex/algorithms/update/halfedge_topology.h>
 #include <queue>
 #include <set>
 #include<vcg/math/base.h>
diff --git a/vcg/complex/algorithms/hole.h b/vcg/complex/algorithms/hole.h
index 2bdd0d02..c3608114 100644
--- a/vcg/complex/algorithms/hole.h
+++ b/vcg/complex/algorithms/hole.h
@@ -139,7 +139,7 @@ First Non working Version
 
 #include <wrap/callback.h>
 #include <vcg/math/base.h>
-#include <vcg/complex/trimesh/clean.h>
+#include <vcg/complex/algorithms/clean.h>
 #include <vcg/space/point3.h>
 #include <vector>
 #include <float.h>
diff --git a/vcg/complex/algorithms/inertia.h b/vcg/complex/algorithms/inertia.h
index d4841bef..242e459f 100644
--- a/vcg/complex/algorithms/inertia.h
+++ b/vcg/complex/algorithms/inertia.h
@@ -59,7 +59,7 @@ journal of graphics tools, volume 1, number 2, 1996
 #include <vcg/math/matrix33.h>
 #include <vcg/math/lin_algebra.h>
 
-#include <vcg/complex/trimesh/update/normal.h>
+#include <vcg/complex/algorithms/update/normal.h>
 namespace vcg
 {
   namespace tri
diff --git a/vcg/complex/algorithms/intersection.h b/vcg/complex/algorithms/intersection.h
index c3982a0a..cbe22a8e 100644
--- a/vcg/complex/algorithms/intersection.h
+++ b/vcg/complex/algorithms/intersection.h
@@ -58,10 +58,10 @@ added vcg header
 #include<vcg/space/segment3.h>
 #include<vcg/space/intersection3.h>
 #include<vcg/complex/edgemesh/allocate.h>
-#include<vcg/complex/trimesh/allocate.h>
-#include<vcg/complex/trimesh/subset.h>
-#include<vcg/complex/trimesh/closest.h>
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/allocate.h>
+#include<vcg/complex/algorithms/subset.h>
+#include<vcg/complex/algorithms/closest.h>
+#include<vcg/complex/complex.h>
 
 #ifndef __VCGLIB_INTERSECTION_TRI_MESH
 #define __VCGLIB_INTERSECTION_TRI_MESH
diff --git a/vcg/complex/algorithms/local_optimization.h b/vcg/complex/algorithms/local_optimization.h
index a567b476..f957a408 100644
--- a/vcg/complex/algorithms/local_optimization.h
+++ b/vcg/complex/algorithms/local_optimization.h
@@ -95,7 +95,7 @@
 #include<algorithm>
 #include<time.h>
 #include<math.h>
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/complex.h>
 
 namespace vcg{
 
diff --git a/vcg/complex/algorithms/local_optimization/quad_diag_collapse.h b/vcg/complex/algorithms/local_optimization/quad_diag_collapse.h
index fdeba144..c4078ff9 100755
--- a/vcg/complex/algorithms/local_optimization/quad_diag_collapse.h
+++ b/vcg/complex/algorithms/local_optimization/quad_diag_collapse.h
@@ -2,14 +2,14 @@
 #define QUAD_DIAGONAL_COLLAPSE_H
 
 #include<vcg/connectors/halfedge_pos.h>
-#include<vcg/complex/local_optimization.h>
-#include<vcg/complex/trimesh/smooth.h>
+#include<vcg/complex/algorithms/local_optimization.h>
+#include<vcg/complex/algorithms/smooth.h>
 
 #include<set>
 
 #include<vcg/space/ray3.h>
 
-#include<vcg/complex/trimesh/halfedge_quad_clean.h>
+#include<vcg/complex/algorithms/halfedge_quad_clean.h>
 
 namespace vcg{
     namespace tri{
diff --git a/vcg/complex/algorithms/local_optimization/tetra_edge_collapse.h b/vcg/complex/algorithms/local_optimization/tetra_edge_collapse.h
index abc0e1de..04c5e5d2 100644
--- a/vcg/complex/algorithms/local_optimization/tetra_edge_collapse.h
+++ b/vcg/complex/algorithms/local_optimization/tetra_edge_collapse.h
@@ -27,7 +27,7 @@
 #ifndef __VCG_DECIMATION_COLLAPSE
 #define __VCG_DECIMATION_COLLAPSE
 
-#include<vcg/complex/local_optimization.h>
+#include<vcg/complex/algorithms/local_optimization.h>
 #include<vcg/simplex/tetrahedron/pos.h>
 #include<vcg/complex/tetramesh/edge_collapse.h>
 #include<vcg/space/point3.h>
diff --git a/vcg/complex/algorithms/local_optimization/tri_edge_collapse.h b/vcg/complex/algorithms/local_optimization/tri_edge_collapse.h
index 1f7ab86c..0a259880 100644
--- a/vcg/complex/algorithms/local_optimization/tri_edge_collapse.h
+++ b/vcg/complex/algorithms/local_optimization/tri_edge_collapse.h
@@ -64,9 +64,9 @@
 #ifndef __VCG_DECIMATION_TRICOLLAPSE
 #define __VCG_DECIMATION_TRICOLLAPSE
 
-#include<vcg/complex/trimesh/edge_collapse.h>
+#include<vcg/complex/algorithms/edge_collapse.h>
 #include<vcg/simplex/face/pos.h>
-#include<vcg/complex/local_optimization.h>
+#include<vcg/complex/algorithms/local_optimization.h>
 
 
 namespace vcg{
diff --git a/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h b/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h
index 58afcaa3..f10b7da2 100644
--- a/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h
+++ b/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h
@@ -76,11 +76,11 @@ corrected error in -error (see localoptimization)
 
 #include<vcg/math/quadric.h>
 #include<vcg/simplex/face/pos.h>
-#include<vcg/complex/trimesh/update/flag.h>
-#include<vcg/complex/trimesh/update/topology.h>
-#include<vcg/complex/trimesh/update/bounding.h>
-#include<vcg/complex/local_optimization/tri_edge_collapse.h>
-#include<vcg/complex/local_optimization.h>
+#include<vcg/complex/algorithms/update/flag.h>
+#include<vcg/complex/algorithms/update/topology.h>
+#include<vcg/complex/algorithms/update/bounding.h>
+#include<vcg/complex/algorithms/local_optimization/tri_edge_collapse.h>
+#include<vcg/complex/algorithms/local_optimization.h>
 
 
 namespace vcg{
diff --git a/vcg/complex/algorithms/local_optimization/tri_edge_flip.h b/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
index 6ea3b5c7..0f4e9115 100644
--- a/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
+++ b/vcg/complex/algorithms/local_optimization/tri_edge_flip.h
@@ -24,7 +24,7 @@
 #ifndef __VCG_DECIMATION_TRIFLIP
 #define __VCG_DECIMATION_TRIFLIP
 
-#include <vcg/complex/local_optimization.h>
+#include <vcg/complex/algorithms/local_optimization.h>
 #include <vcg/simplex/face/topology.h>
 #include <vcg/space/triangle3.h>
 
diff --git a/vcg/complex/algorithms/nring.h b/vcg/complex/algorithms/nring.h
index 5d1756f8..db8706f3 100644
--- a/vcg/complex/algorithms/nring.h
+++ b/vcg/complex/algorithms/nring.h
@@ -25,8 +25,8 @@
  ****************************************************************************/
 
 #include <vcg/simplex/face/jumping_pos.h>
-#include <vcg/complex/trimesh/allocate.h>
-#include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/allocate.h>
+#include <vcg/complex/algorithms/update/flag.h>
 #include <vector>
 
 namespace vcg
diff --git a/vcg/complex/algorithms/overlap_estimation.h b/vcg/complex/algorithms/overlap_estimation.h
index 917da703..99e5a60a 100644
--- a/vcg/complex/algorithms/overlap_estimation.h
+++ b/vcg/complex/algorithms/overlap_estimation.h
@@ -27,8 +27,8 @@
 #include <vcg/math/gen_normal.h>
 #include <vcg/math/random_generator.h>
 #include <vcg/space/index/grid_static_ptr.h>
-#include <vcg/complex/trimesh/closest.h>
-#include <vcg/complex/trimesh/point_sampling.h>
+#include <vcg/complex/algorithms/closest.h>
+#include <vcg/complex/algorithms/point_sampling.h>
 
 #include <qdatetime.h>
 
diff --git a/vcg/complex/algorithms/point_sampling.h b/vcg/complex/algorithms/point_sampling.h
index 8a7ae328..a47a5946 100644
--- a/vcg/complex/algorithms/point_sampling.h
+++ b/vcg/complex/algorithms/point_sampling.h
@@ -36,12 +36,12 @@ sampling strategies (montecarlo, stratified etc).
 #define __VCGLIB_POINT_SAMPLING
 
 #include <vcg/math/random_generator.h>
-#include <vcg/complex/trimesh/closest.h>
+#include <vcg/complex/algorithms/closest.h>
 #include <vcg/space/index/spatial_hashing.h>
-#include <vcg/complex/trimesh/stat.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/algorithms/stat.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/flag.h>
 #include <vcg/space/box2.h>
 #include <vcg/space/segment2.h>
 
diff --git a/vcg/complex/algorithms/polygon_support.h b/vcg/complex/algorithms/polygon_support.h
index 0ef331c1..89d95b71 100644
--- a/vcg/complex/algorithms/polygon_support.h
+++ b/vcg/complex/algorithms/polygon_support.h
@@ -25,7 +25,7 @@
 #define __VCGLIB_POLYGON_SUPPORT
 
 #include <vector>
-#include <vcg/complex/trimesh/subset.h>
+#include <vcg/complex/algorithms/subset.h>
 #include <vcg/simplex/face/jumping_pos.h>
 #include <vcg/space/planar_polygon_tessellation.h>
 
@@ -34,7 +34,7 @@ namespace vcg
 	namespace tri{
 		/// \ingroup trimesh 
 
-		/// \headerfile polygon_support.h vcg/complex/trimesh/polygon_support.h
+		/// \headerfile polygon_support.h vcg/complex/algorithms/polygon_support.h
 
 		/// \brief This class is used convert between polygonal meshes and triangular meshes
 
diff --git a/vcg/complex/algorithms/refine.h b/vcg/complex/algorithms/refine.h
index 49ee79e3..bd39c90c 100644
--- a/vcg/complex/algorithms/refine.h
+++ b/vcg/complex/algorithms/refine.h
@@ -32,10 +32,10 @@
 #include <vcg/space/texcoord2.h>
 #include <vcg/space/color4.h>
 #include <vcg/simplex/face/pos.h>
-#include<vcg/complex/trimesh/allocate.h>
-#include<vcg/complex/trimesh/update/topology.h>
+#include<vcg/complex/allocate.h>
+#include<vcg/complex/algorithms/update/topology.h>
 #include<wrap/callback.h>
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 #include <vcg/space/triangle3.h>
 
 namespace vcg{
diff --git a/vcg/complex/algorithms/refine_loop.h b/vcg/complex/algorithms/refine_loop.h
index 180a540c..55913cfb 100644
--- a/vcg/complex/algorithms/refine_loop.h
+++ b/vcg/complex/algorithms/refine_loop.h
@@ -32,12 +32,12 @@
 
 #include <cmath>
 #include <vcg/space/point3.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/refine.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/refine.h>
 #include <vcg/space/color4.h>
 #include <vcg/container/simple_temporary_data.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/update/color.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/update/color.h>
 
 
 namespace vcg{
diff --git a/vcg/complex/algorithms/smooth.h b/vcg/complex/algorithms/smooth.h
index 909f81a8..d648db5c 100644
--- a/vcg/complex/algorithms/smooth.h
+++ b/vcg/complex/algorithms/smooth.h
@@ -29,9 +29,9 @@
 #include <vcg/space/point3.h>
 #include <vcg/space/ray3.h>
 #include <vcg/container/simple_temporary_data.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/halfedge_topology.h>
-#include <vcg/complex/trimesh/closest.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/halfedge_topology.h>
+#include <vcg/complex/algorithms/closest.h>
 
 
 namespace vcg
diff --git a/vcg/complex/algorithms/stat.h b/vcg/complex/algorithms/stat.h
index 06b9babe..02aa5894 100644
--- a/vcg/complex/algorithms/stat.h
+++ b/vcg/complex/algorithms/stat.h
@@ -44,10 +44,10 @@ Initial Commit
 #include <vcg/math/histogram.h>
 #include <vcg/simplex/face/pos.h>
 #include <vcg/simplex/face/topology.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/closest.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/closest.h>
 #include <vcg/space/index/grid_static_ptr.h>
-#include <vcg/complex/trimesh/allocate.h>
+#include <vcg/complex/allocate.h>
 
 
 namespace vcg {
diff --git a/vcg/complex/algorithms/subset.h b/vcg/complex/algorithms/subset.h
index e43aa0a3..97d1af4c 100644
--- a/vcg/complex/algorithms/subset.h
+++ b/vcg/complex/algorithms/subset.h
@@ -60,7 +60,7 @@ Added History Info
 #ifndef __VCGLIB_TRISUBSET
 #define __VCGLIB_TRISUBSET
 
-#include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/algorithms/update/flag.h>
 
 namespace vcg {
 namespace tri {
diff --git a/vcg/complex/algorithms/update/bounding.h b/vcg/complex/algorithms/update/bounding.h
index 9a1ca446..bf4501ba 100644
--- a/vcg/complex/algorithms/update/bounding.h
+++ b/vcg/complex/algorithms/update/bounding.h
@@ -56,7 +56,7 @@ namespace tri {
 
 /// \ingroup trimesh 
 
-/// \headerfile bounding.h vcg/complex/trimesh/update/bounding.h
+/// \headerfile bounding.h vcg/complex/algorithms/update/bounding.h
 
 /// \brief Management, updating and computation of per-vertex and per-face normals.
 /** 
diff --git a/vcg/complex/algorithms/update/color.h b/vcg/complex/algorithms/update/color.h
index 2a500eae..386eb1bd 100644
--- a/vcg/complex/algorithms/update/color.h
+++ b/vcg/complex/algorithms/update/color.h
@@ -28,16 +28,16 @@
 #include <time.h>
 #include <vcg/space/color4.h>
 #include <vcg/math/histogram.h>
-#include <vcg/complex/trimesh/stat.h>
+#include <vcg/complex/algorithms/stat.h>
 #include <vcg/math/perlin_noise.h>
 #include <vcg/math/random_generator.h>
-#include <vcg/complex/trimesh/clean.h>
+#include <vcg/complex/algorithms/clean.h>
 namespace vcg {
 namespace tri {
 
 /// \ingroup trimesh
 
-/// \headerfile color.h vcg/complex/trimesh/update/color.h
+/// \headerfile color.h vcg/complex/algorithms/update/color.h
 
 /// \brief Generation of per-vertex and per-face colors according to various strategy.
 /**
diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h
index e2efa151..edaaf0ee 100644
--- a/vcg/complex/algorithms/update/curvature.h
+++ b/vcg/complex/algorithms/update/curvature.h
@@ -62,11 +62,11 @@ the vertex
 #include <vcg/simplex/face/pos.h>
 #include <vcg/simplex/face/jumping_pos.h>
 #include <vcg/container/simple_temporary_data.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/point_sampling.h>
-#include <vcg/complex/trimesh/append.h>
-#include <vcg/complex/intersection.h>
-#include <vcg/complex/trimesh/inertia.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/point_sampling.h>
+#include <vcg/complex/append.h>
+#include <vcg/complex/algorithms/intersection.h>
+#include <vcg/complex/algorithms/inertia.h>
 #include <vcg/math/matrix33.h>
 
 
@@ -75,7 +75,7 @@ namespace tri {
 
 /// \ingroup trimesh
 
-/// \headerfile curvature.h vcg/complex/trimesh/update/curvature.h
+/// \headerfile curvature.h vcg/complex/algorithms/update/curvature.h
 
 /// \brief Management, updating and computation of per-vertex and per-face normals.
 /**
diff --git a/vcg/complex/algorithms/update/curvature_fitting.h b/vcg/complex/algorithms/update/curvature_fitting.h
index f8cb9e9c..45f7105e 100644
--- a/vcg/complex/algorithms/update/curvature_fitting.h
+++ b/vcg/complex/algorithms/update/curvature_fitting.h
@@ -34,11 +34,11 @@
 #include <vcg/simplex/face/pos.h>
 #include <vcg/simplex/face/jumping_pos.h>
 #include <vcg/container/simple_temporary_data.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/point_sampling.h>
-#include <vcg/complex/trimesh/append.h>
-#include <vcg/complex/intersection.h>
-#include <vcg/complex/trimesh/inertia.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/point_sampling.h>
+#include <vcg/complex/append.h>
+#include <vcg/complex/algorithms/intersection.h>
+#include <vcg/complex/algorithms/inertia.h>
 #include <vcg/math/matrix33.h>
 
 #include <vcg/Eigen/Core>
@@ -48,7 +48,7 @@
 
 // GG include
 #include <vector>
-#include <vcg/complex/trimesh/nring.h>
+#include <vcg/complex/algorithms/nring.h>
 
 
 namespace vcg {
@@ -56,7 +56,7 @@ namespace tri {
 
 /// \ingroup trimesh
 
-/// \headerfile curvature_fitting.h vcg/complex/trimesh/update/curvature_fitting.h
+/// \headerfile curvature_fitting.h vcg/complex/algorithms/update/curvature_fitting.h
 
 /// \brief Computation of per-vertex directions and values of curvature.
 /**
diff --git a/vcg/complex/algorithms/update/edges.h b/vcg/complex/algorithms/update/edges.h
index 5d3ede6f..016d7056 100644
--- a/vcg/complex/algorithms/update/edges.h
+++ b/vcg/complex/algorithms/update/edges.h
@@ -47,7 +47,7 @@ namespace tri {
 
 /// \ingroup trimesh 
 
-	/// \headerfile edges.h vcg/complex/trimesh/update/edges.h
+	/// \headerfile edges.h vcg/complex/algorithms/update/edges.h
 
 	/// \brief This class is used to compute or update the precomputed data used to efficiently compute point-face distances.
 	template <class ComputeMeshType>
diff --git a/vcg/complex/algorithms/update/fitmaps.h b/vcg/complex/algorithms/update/fitmaps.h
index a9a85464..8ab6e977 100644
--- a/vcg/complex/algorithms/update/fitmaps.h
+++ b/vcg/complex/algorithms/update/fitmaps.h
@@ -27,15 +27,15 @@
 #include <vcg/math/histogram.h>
 
 #include <vcg/simplex/face/jumping_pos.h>
-#include <vcg/complex/trimesh/allocate.h>
-#include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/allocate.h>
+#include <vcg/complex/algorithms/update/flag.h>
 #include <vector>
 #include <set>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/curvature.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include "vcg/complex/trimesh/update/curvature_fitting.h"
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/curvature.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include "vcg/complex/algorithms/update/curvature_fitting.h"
 
 #include <vcg/Eigen/Core>
 #include <vcg/Eigen/QR>
@@ -44,9 +44,9 @@
 
 #include <algorithm>
 
-#include <vcg/complex/trimesh/nring.h>
+#include <vcg/complex/algorithms/nring.h>
 
-#include <vcg/complex/trimesh/smooth.h>
+#include <vcg/complex/algorithms/smooth.h>
 
 
 using namespace Eigen;
diff --git a/vcg/complex/algorithms/update/flag.h b/vcg/complex/algorithms/update/flag.h
index ca6b3591..e5c75857 100644
--- a/vcg/complex/algorithms/update/flag.h
+++ b/vcg/complex/algorithms/update/flag.h
@@ -95,7 +95,7 @@ namespace vcg {
 namespace tri {
 /// \ingroup trimesh 
 
-/// \headerfile flag.h vcg/complex/trimesh/update/flag.h
+/// \headerfile flag.h vcg/complex/algorithms/update/flag.h
 
 /// \brief Management, updating and computation of per-vertex and per-face flags (like border flags).
 
diff --git a/vcg/complex/algorithms/update/halfedge_indexed.h b/vcg/complex/algorithms/update/halfedge_indexed.h
index e7ac1607..9bbf4a3f 100644
--- a/vcg/complex/algorithms/update/halfedge_indexed.h
+++ b/vcg/complex/algorithms/update/halfedge_indexed.h
@@ -25,18 +25,18 @@
 #define __VCGLIB_HALFEDGE_
 
 #include <vector>
-#include <vcg/complex/trimesh/allocate.h>
-#include <vcg/complex/trimesh/clean.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/update/halfedge_topology.h>
+#include <vcg/complex/allocate.h>
+#include <vcg/complex/algorithms/clean.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/update/halfedge_topology.h>
 
 namespace vcg
 {
     namespace tri{
         /// \ingroup trimesh
 
-        /// \headerfile edge_support.h vcg/complex/trimesh/edge_support.h
+        /// \headerfile edge_support.h vcg/complex/algorithms/edge_support.h
 
         /// \brief This class is used to build edge based data structure from indexed data structure and viceversa
 
diff --git a/vcg/complex/algorithms/update/halfedge_topology.h b/vcg/complex/algorithms/update/halfedge_topology.h
index 11a7a8e3..554e22e0 100644
--- a/vcg/complex/algorithms/update/halfedge_topology.h
+++ b/vcg/complex/algorithms/update/halfedge_topology.h
@@ -2,7 +2,7 @@
 #define VCG_HEDGE_TOPOLOGY
 
 #include <vcg/connectors/halfedge_pos.h>
-#include <vcg/complex/trimesh/allocate.h>
+#include <vcg/complex/allocate.h>
 
 #include <vector>
 #include <set>
diff --git a/vcg/complex/algorithms/update/normal.h b/vcg/complex/algorithms/update/normal.h
index 7be220e4..d682f007 100644
--- a/vcg/complex/algorithms/update/normal.h
+++ b/vcg/complex/algorithms/update/normal.h
@@ -26,7 +26,7 @@
 
 #include <vcg/space/triangle3.h>
 #include <vcg/math/matrix33.h>
-#include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/algorithms/update/flag.h>
 
 
 namespace vcg {
@@ -34,7 +34,7 @@ namespace tri {
 
 /// \ingroup trimesh
 
-/// \headerfile normal.h vcg/complex/trimesh/update/normal.h
+/// \headerfile normal.h vcg/complex/algorithms/update/normal.h
 
 /// \brief Management, updating and computation of per-vertex and per-face normals.
 /**
diff --git a/vcg/complex/algorithms/update/position.h b/vcg/complex/algorithms/update/position.h
index 43482054..23fd8021 100644
--- a/vcg/complex/algorithms/update/position.h
+++ b/vcg/complex/algorithms/update/position.h
@@ -39,7 +39,7 @@ namespace tri {
 
 /// \ingroup trimesh 
 
-/// \headerfile position.h vcg/complex/trimesh/update/position.h
+/// \headerfile position.h vcg/complex/algorithms/update/position.h
 
 /// \brief This class is used to update vertex position according to a transformation matrix.
 template <class ComputeMeshType>
diff --git a/vcg/complex/algorithms/update/quality.h b/vcg/complex/algorithms/update/quality.h
index 65d4c7db..d89fe17c 100644
--- a/vcg/complex/algorithms/update/quality.h
+++ b/vcg/complex/algorithms/update/quality.h
@@ -24,8 +24,8 @@
 #define __VCG_TRI_UPDATE_QUALITY
 #include <vcg/simplex/face/pos.h>
 #include <vcg/simplex/face/topology.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/stat.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/stat.h>
 #include <algorithm>
 #include <vector>
 #include <stack>
@@ -35,7 +35,7 @@ namespace vcg {
 namespace tri {
 /// \ingroup trimesh 
 
-/// \headerfile quality.h vcg/complex/trimesh/update/quality.h
+/// \headerfile quality.h vcg/complex/algorithms/update/quality.h
 
 /// \brief Generation of per-vertex and per-face qualities. 
 /**
diff --git a/vcg/complex/algorithms/update/selection.h b/vcg/complex/algorithms/update/selection.h
index fc552e9b..a99d36ba 100644
--- a/vcg/complex/algorithms/update/selection.h
+++ b/vcg/complex/algorithms/update/selection.h
@@ -24,7 +24,7 @@
 #define __VCG_TRI_UPDATE_SELECTION
 
 #include <queue>
-#include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/algorithms/update/flag.h>
 
 namespace vcg {
 namespace tri {
@@ -98,7 +98,7 @@ private:
 
 /// \ingroup trimesh 
 
-/// \headerfile selection.h vcg/complex/trimesh/update/selection.h
+/// \headerfile selection.h vcg/complex/algorithms/update/selection.h
 
 /// \brief Management, updating and computation of per-vertex and per-face normals.
 /** 
diff --git a/vcg/complex/algorithms/update/texture.h b/vcg/complex/algorithms/update/texture.h
index b5b1d20f..e7f3762c 100644
--- a/vcg/complex/algorithms/update/texture.h
+++ b/vcg/complex/algorithms/update/texture.h
@@ -36,7 +36,7 @@ namespace tri {
 
 /// \ingroup trimesh 
 
-/// \headerfile texture.h vcg/complex/trimesh/update/texture.h
+/// \headerfile texture.h vcg/complex/algorithms/update/texture.h
 
 /// \brief This class is used to update vertex position according to a transformation matrix.
 template <class ComputeMeshType>
diff --git a/vcg/complex/algorithms/update/topology.h b/vcg/complex/algorithms/update/topology.h
index ff805e37..05d55a41 100644
--- a/vcg/complex/algorithms/update/topology.h
+++ b/vcg/complex/algorithms/update/topology.h
@@ -91,12 +91,12 @@ Initial commit
 #include <algorithm>
 #include <vector>
 #include <vcg/simplex/face/pos.h>
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 namespace vcg {
 namespace tri {
 /// \ingroup trimesh 
 
-/// \headerfile topology.h vcg/complex/trimesh/update/topology.h
+/// \headerfile topology.h vcg/complex/algorithms/update/topology.h
 
 /// \brief Generation of per-vertex and per-face topological information.
 
@@ -114,7 +114,7 @@ typedef typename MeshType::FacePointer    FacePointer;
 typedef typename MeshType::FaceIterator   FaceIterator;
 
 
-/// \headerfile topology.h vcg/complex/trimesh/update/topology.h
+/// \headerfile topology.h vcg/complex/algorithms/update/topology.h
 
 /// \brief Auxiliairy data structure for computing face face adjacency information. 
 /** 
@@ -277,7 +277,7 @@ static void VertexFace(MeshType &m)
 }
 
 
-/// \headerfile topology.h vcg/complex/trimesh/update/topology.h
+/// \headerfile topology.h vcg/complex/algorithms/update/topology.h
 
 /// \brief Auxiliairy data structure for computing face face adjacency information. 
 /**