diff --git a/apps/sample/hashing_2D/test_hash2d.cpp b/apps/sample/hashing_2D/test_hash2d.cpp
index d7807157..0902e26e 100644
--- a/apps/sample/hashing_2D/test_hash2d.cpp
+++ b/apps/sample/hashing_2D/test_hash2d.cpp
@@ -24,8 +24,8 @@
 #include <time.h>
 #include <vcg/space/distance2.h>
 #include<vcg/space/segment2.h>
-#include<vcg/space/index/index2d/grid_static_ptr_2d.h>
-#include<vcg/space/index/index2d/grid_closest_2d.h>
+#include<vcg/space/index/grid_static_ptr2d.h>
+#include<vcg/space/index/grid_closest2d.h>
 #include<vcg/space/intersection2.h>
 
 typedef double MyScalarType;
diff --git a/apps/sample/hashing_2D/test_hash2d.pro b/apps/sample/hashing_2D/test_hash2d.pro
index 7db83219..21fcc36f 100644
--- a/apps/sample/hashing_2D/test_hash2d.pro
+++ b/apps/sample/hashing_2D/test_hash2d.pro
@@ -7,9 +7,9 @@ DEPENDPATH += .
 INCLUDEPATH += . ../../..
 CONFIG += console stl
 TEMPLATE = app
-HEADERS += ../../../vcg/space/index/index2d/grid_static_ptr_2d.h\
-           ../../../vcg/space/index/index2d/closest_2d.h\
-           ../../../vcg/space/index/index2d/space_iterators_2d.h\
-           ../../../vcg/space/index/index2d/grid_closest_2d.h
+HEADERS += ../../../vcg/space/index/grid_static_ptr2d.h\
+           ../../../vcg/space/index/closest2d.h\
+           ../../../vcg/space/index/space_iterators2d.h\
+           ../../../vcg/space/index/grid_closest2d.h
 
 SOURCES += test_hash2d.cpp
diff --git a/vcg/space/index/index2d/base2d.h b/vcg/space/index/base2d.h
similarity index 100%
rename from vcg/space/index/index2d/base2d.h
rename to vcg/space/index/base2d.h
diff --git a/vcg/space/index/index2d/closest2d.h b/vcg/space/index/closest2d.h
similarity index 100%
rename from vcg/space/index/index2d/closest2d.h
rename to vcg/space/index/closest2d.h
diff --git a/vcg/space/index/index2d/grid_closest2d.h b/vcg/space/index/grid_closest2d.h
similarity index 99%
rename from vcg/space/index/index2d/grid_closest2d.h
rename to vcg/space/index/grid_closest2d.h
index f1b7cbd7..60574fa4 100644
--- a/vcg/space/index/index2d/grid_closest2d.h
+++ b/vcg/space/index/grid_closest2d.h
@@ -24,7 +24,7 @@
 #ifndef __VCGLIB_GRID_CLOSEST_2D
 #define __VCGLIB_GRID_CLOSEST_2D
 
-#include <vcg/space/index/index2d/space_iterators_2d.h>
+#include <vcg/space/index/space_iterators2d.h>
 #include <vcg/space/intersection2.h>
 
 namespace vcg{
diff --git a/vcg/space/index/index2d/grid_static_ptr2d.h b/vcg/space/index/grid_static_ptr2d.h
similarity index 98%
rename from vcg/space/index/index2d/grid_static_ptr2d.h
rename to vcg/space/index/grid_static_ptr2d.h
index af2b7e6d..5a83780e 100644
--- a/vcg/space/index/index2d/grid_static_ptr2d.h
+++ b/vcg/space/index/grid_static_ptr2d.h
@@ -30,8 +30,8 @@
 
 #include <vcg/space/box2.h>
 #include <vcg/space/line2.h>
-#include <vcg/space/index/index2d/grid_util_2d.h>
-#include <vcg/space/index/index2d/grid_closest_2d.h>
+#include <vcg/space/index/grid_util2d.h>
+#include <vcg/space/index/grid_closest2d.h>
 
 namespace vcg {
 
diff --git a/vcg/space/index/index2d/grid_util2d.h b/vcg/space/index/grid_util2d.h
similarity index 99%
rename from vcg/space/index/index2d/grid_util2d.h
rename to vcg/space/index/grid_util2d.h
index 7b710a36..134f37b6 100644
--- a/vcg/space/index/index2d/grid_util2d.h
+++ b/vcg/space/index/grid_util2d.h
@@ -26,7 +26,7 @@
 #ifndef __VCGLIB_GRID_UTIL_2D
 #define __VCGLIB_GRID_UTIL_2D
 
-#include<vcg/space/index/index2d/base_2d.h>
+#include<vcg/space/index/base2d.h>
 #include<vcg/space/box2.h>
 
 
diff --git a/vcg/space/index/index2d/space_iterators2d.h b/vcg/space/index/space_iterators2d.h
similarity index 100%
rename from vcg/space/index/index2d/space_iterators2d.h
rename to vcg/space/index/space_iterators2d.h
diff --git a/vcg/space/index/index2d/spatial_hashing2d.h b/vcg/space/index/spatial_hashing2d.h
similarity index 100%
rename from vcg/space/index/index2d/spatial_hashing2d.h
rename to vcg/space/index/spatial_hashing2d.h