diff --git a/src/fgt/edit_straightener/edit_straightener.pro b/src/meshlabplugins/edit_straightener/edit_straightener.pro
similarity index 100%
rename from src/fgt/edit_straightener/edit_straightener.pro
rename to src/meshlabplugins/edit_straightener/edit_straightener.pro
diff --git a/src/fgt/edit_straightener/editstraightener.cpp b/src/meshlabplugins/edit_straightener/editstraightener.cpp
similarity index 100%
rename from src/fgt/edit_straightener/editstraightener.cpp
rename to src/meshlabplugins/edit_straightener/editstraightener.cpp
diff --git a/src/fgt/edit_straightener/editstraightener.h b/src/meshlabplugins/edit_straightener/editstraightener.h
similarity index 100%
rename from src/fgt/edit_straightener/editstraightener.h
rename to src/meshlabplugins/edit_straightener/editstraightener.h
diff --git a/src/fgt/edit_straightener/editstraightener.qrc b/src/meshlabplugins/edit_straightener/editstraightener.qrc
similarity index 100%
rename from src/fgt/edit_straightener/editstraightener.qrc
rename to src/meshlabplugins/edit_straightener/editstraightener.qrc
diff --git a/src/fgt/edit_straightener/editstraightener.ui b/src/meshlabplugins/edit_straightener/editstraightener.ui
similarity index 100%
rename from src/fgt/edit_straightener/editstraightener.ui
rename to src/meshlabplugins/edit_straightener/editstraightener.ui
diff --git a/src/fgt/edit_straightener/editstraightenerdialog.cpp b/src/meshlabplugins/edit_straightener/editstraightenerdialog.cpp
similarity index 100%
rename from src/fgt/edit_straightener/editstraightenerdialog.cpp
rename to src/meshlabplugins/edit_straightener/editstraightenerdialog.cpp
diff --git a/src/fgt/edit_straightener/editstraightenerdialog.h b/src/meshlabplugins/edit_straightener/editstraightenerdialog.h
similarity index 100%
rename from src/fgt/edit_straightener/editstraightenerdialog.h
rename to src/meshlabplugins/edit_straightener/editstraightenerdialog.h
diff --git a/src/fgt/edit_straightener/images/cur_straightener.png b/src/meshlabplugins/edit_straightener/images/cur_straightener.png
similarity index 100%
rename from src/fgt/edit_straightener/images/cur_straightener.png
rename to src/meshlabplugins/edit_straightener/images/cur_straightener.png
diff --git a/src/fgt/edit_straightener/images/icon_straightener.png b/src/meshlabplugins/edit_straightener/images/icon_straightener.png
similarity index 100%
rename from src/fgt/edit_straightener/images/icon_straightener.png
rename to src/meshlabplugins/edit_straightener/images/icon_straightener.png
diff --git a/src/meshlabplugins/io_tri/tri_io.cpp b/src/meshlabplugins/io_tri/io_tri.cpp
similarity index 100%
rename from src/meshlabplugins/io_tri/tri_io.cpp
rename to src/meshlabplugins/io_tri/io_tri.cpp
diff --git a/src/meshlabplugins/io_tri/tri_io.h b/src/meshlabplugins/io_tri/io_tri.h
similarity index 100%
rename from src/meshlabplugins/io_tri/tri_io.h
rename to src/meshlabplugins/io_tri/io_tri.h
diff --git a/src/meshlabplugins/io_tri/tri_io.pro b/src/meshlabplugins/io_tri/io_tri.pro
similarity index 85%
rename from src/meshlabplugins/io_tri/tri_io.pro
rename to src/meshlabplugins/io_tri/io_tri.pro
index 06fc4ff38..d3746fc2e 100755
--- a/src/meshlabplugins/io_tri/tri_io.pro
+++ b/src/meshlabplugins/io_tri/io_tri.pro
@@ -1,11 +1,11 @@
 TEMPLATE      = lib
 CONFIG       += plugin
 INCLUDEPATH  += ../.. ../../../../sf ../../../../code/lib/glew/include 
-HEADERS       = tri_io.h \
+HEADERS       = io_tri.h \
 				
-SOURCES       = tri_io.cpp 
+SOURCES       = io_tri.cpp 
 				
-TARGET        = tri_io
+TARGET        = io_tri
 DESTDIR       = ../../meshlab/plugins
 
 # the following line is needed to avoid mismatch between 
diff --git a/src/meshlabplugins/io_u3d/u3d_io.cpp b/src/meshlabplugins/io_u3d/io_u3d.cpp
similarity index 100%
rename from src/meshlabplugins/io_u3d/u3d_io.cpp
rename to src/meshlabplugins/io_u3d/io_u3d.cpp
diff --git a/src/meshlabplugins/io_u3d/u3d_io.h b/src/meshlabplugins/io_u3d/io_u3d.h
similarity index 100%
rename from src/meshlabplugins/io_u3d/u3d_io.h
rename to src/meshlabplugins/io_u3d/io_u3d.h
diff --git a/src/meshlabplugins/io_u3d/u3d_io.pro b/src/meshlabplugins/io_u3d/io_u3d.pro
similarity index 89%
rename from src/meshlabplugins/io_u3d/u3d_io.pro
rename to src/meshlabplugins/io_u3d/io_u3d.pro
index 9255bd42d..53e443dfa 100644
--- a/src/meshlabplugins/io_u3d/u3d_io.pro
+++ b/src/meshlabplugins/io_u3d/io_u3d.pro
@@ -3,12 +3,12 @@ CONFIG       += plugin
 INCLUDEPATH  += ../.. ../../../../sf ../../../../code/lib/glew/include 
 
 FORMS         = ui/u3d_gui.ui 				
-HEADERS       = u3d_io.h \
+HEADERS       = io_u3d.h \
 				u3d_gui.h \
 				../../../../sf/wrap/io_trimesh/export_u3d.h
-SOURCES       = u3d_io.cpp \
+SOURCES       = io_u3d.cpp \
 				u3d_gui.cpp
-TARGET        = u3d_io
+TARGET        = io_u3d
 DESTDIR       = ../../meshlab/plugins
 CONFIG		+= debug_and_release
 
diff --git a/src/fgt/io_x3d/export_x3d.h b/src/meshlabplugins/io_x3d/export_x3d.h
similarity index 100%
rename from src/fgt/io_x3d/export_x3d.h
rename to src/meshlabplugins/io_x3d/export_x3d.h
diff --git a/src/fgt/io_x3d/import_x3d.h b/src/meshlabplugins/io_x3d/import_x3d.h
similarity index 100%
rename from src/fgt/io_x3d/import_x3d.h
rename to src/meshlabplugins/io_x3d/import_x3d.h
diff --git a/src/fgt/io_x3d/io_x3d.cpp b/src/meshlabplugins/io_x3d/io_x3d.cpp
similarity index 100%
rename from src/fgt/io_x3d/io_x3d.cpp
rename to src/meshlabplugins/io_x3d/io_x3d.cpp
diff --git a/src/fgt/io_x3d/io_x3d.h b/src/meshlabplugins/io_x3d/io_x3d.h
similarity index 100%
rename from src/fgt/io_x3d/io_x3d.h
rename to src/meshlabplugins/io_x3d/io_x3d.h
diff --git a/src/fgt/io_x3d/io_x3d.pro b/src/meshlabplugins/io_x3d/io_x3d.pro
similarity index 100%
rename from src/fgt/io_x3d/io_x3d.pro
rename to src/meshlabplugins/io_x3d/io_x3d.pro
diff --git a/src/fgt/io_x3d/util_x3d.h b/src/meshlabplugins/io_x3d/util_x3d.h
similarity index 100%
rename from src/fgt/io_x3d/util_x3d.h
rename to src/meshlabplugins/io_x3d/util_x3d.h
diff --git a/src/fgt/io_x3d/vrml/Parser.cpp b/src/meshlabplugins/io_x3d/vrml/Parser.cpp
similarity index 100%
rename from src/fgt/io_x3d/vrml/Parser.cpp
rename to src/meshlabplugins/io_x3d/vrml/Parser.cpp
diff --git a/src/fgt/io_x3d/vrml/Parser.frame b/src/meshlabplugins/io_x3d/vrml/Parser.frame
similarity index 100%
rename from src/fgt/io_x3d/vrml/Parser.frame
rename to src/meshlabplugins/io_x3d/vrml/Parser.frame
diff --git a/src/fgt/io_x3d/vrml/Parser.h b/src/meshlabplugins/io_x3d/vrml/Parser.h
similarity index 100%
rename from src/fgt/io_x3d/vrml/Parser.h
rename to src/meshlabplugins/io_x3d/vrml/Parser.h
diff --git a/src/fgt/io_x3d/vrml/Scanner.cpp b/src/meshlabplugins/io_x3d/vrml/Scanner.cpp
similarity index 100%
rename from src/fgt/io_x3d/vrml/Scanner.cpp
rename to src/meshlabplugins/io_x3d/vrml/Scanner.cpp
diff --git a/src/fgt/io_x3d/vrml/Scanner.frame b/src/meshlabplugins/io_x3d/vrml/Scanner.frame
similarity index 100%
rename from src/fgt/io_x3d/vrml/Scanner.frame
rename to src/meshlabplugins/io_x3d/vrml/Scanner.frame
diff --git a/src/fgt/io_x3d/vrml/Scanner.h b/src/meshlabplugins/io_x3d/vrml/Scanner.h
similarity index 100%
rename from src/fgt/io_x3d/vrml/Scanner.h
rename to src/meshlabplugins/io_x3d/vrml/Scanner.h
diff --git a/src/fgt/io_x3d/vrml/VrmlTranslator.atg b/src/meshlabplugins/io_x3d/vrml/VrmlTranslator.atg
similarity index 100%
rename from src/fgt/io_x3d/vrml/VrmlTranslator.atg
rename to src/meshlabplugins/io_x3d/vrml/VrmlTranslator.atg
diff --git a/src/meshlabplugins/meshlabpluginsv12.pro b/src/meshlabplugins/meshlabpluginsv12.pro
index 79b6d688e..186a1fe94 100644
--- a/src/meshlabplugins/meshlabpluginsv12.pro
+++ b/src/meshlabplugins/meshlabpluginsv12.pro
@@ -6,6 +6,7 @@ SUBDIRS       = meshfilter \
 				epoch_io \
 				io_u3d\
 				io_tri\
+				io_x3d \
 				meshrender \
 				cleanfilter \
 				filter_ao \ 
@@ -22,6 +23,7 @@ SUBDIRS       = meshfilter \
 				editmeasure\
 				editrgbtri\
 				editsegment\
+				edit_straightener \
 				../sampleplugins/sampleedit \
 				../sampleplugins/samplefilter \
 				../sampleplugins/samplefilterdoc \
@@ -34,10 +36,8 @@ SUBDIRS       = meshfilter \
 				../fgt/filter_dirt \
 				../fgt/edit_quality \
 				../fgt/edit_quality/filter_quality \
-				../fgt/edit_straightener \
 				../fgt/edit_texture\
-				../fgt/editpaint\
-				../fgt/io_x3d
+				../fgt/editpaint