diff --git a/benchmarks/3d/Torus-ExtrMesh-2.geo b/benchmarks/3d/Torus-ExtrMesh-2.geo
new file mode 100644
index 0000000000000000000000000000000000000000..9622937dff89eb9f374c20004e8ca5a7ec53b7a2
--- /dev/null
+++ b/benchmarks/3d/Torus-ExtrMesh-2.geo
@@ -0,0 +1,33 @@
+lc = .2;               
+Point(1) = {2.0,0.0,0.0,lc};               
+Point(2) = {2.0,1,0.0,lc};               
+Point(3) = {1,0,0.0,lc};               
+Point(4) = {3,0,0.0,lc};               
+Point(5) = {2,-1,0.0,lc};               
+Circle(1) = {4,1,2};               
+              
+Circle(2) = {2,1,3};              
+Circle(3) = {3,1,5};              
+Circle(4) = {5,1,4};              
+Line Loop(5) = {4,1,2,3};              
+Plane Surface(6) = {5};              
+            
+Extrude Surface{6, {0.0,1,0}, {0,0.0,0.0}, 3.14159/2}
+{    
+   Layers {{10,25,10},{11,22,11},{.1,.9,1.}} ;    
+} ;            
+
+Coherence;            
+Extrude Surface {6, {0,0.0,2}} ; 
+
+
+Surface Loop(51) = {6,37,41,45,49,50}; 
+Complex Volume(52) = {51}; 
+
+
+Extrude Surface {45, {0,2,0.0}}
+{    
+   Layers {{10,25,10},{111,222,111},{.1,.9,1.}};    
+} ; 
+Coherence; 
+
diff --git a/benchmarks/2d/francois.geo b/benchmarks/3d/francois.geo
similarity index 96%
rename from benchmarks/2d/francois.geo
rename to benchmarks/3d/francois.geo
index 569fde384229d2d6ceeae16d3c7f6057991e81c3..edd8efe4c4a8da44e0613fd22751aeee79fcdbed 100644
--- a/benchmarks/2d/francois.geo
+++ b/benchmarks/3d/francois.geo
@@ -19,7 +19,7 @@ Line(8) = {9,8};
 Line Loop(9) = {6,7,8,5};   
 Line Loop(10) = {4,1,2,3};   
 Plane Surface(11) = {9,10};   
-Extrude Surface (11, {0,0.0,2.0})
+Extrude Surface {11, {0,0.0,2.0}}
 {
    Layers { {2,1,2} , {100,200,100} , {.05,.95,1.} } ;
 };
diff --git a/benchmarks/bugs/p4a.geo b/benchmarks/3d/p4a.geo
similarity index 100%
rename from benchmarks/bugs/p4a.geo
rename to benchmarks/3d/p4a.geo
diff --git a/examples/gmsh.tmp b/examples/gmsh.tmp
deleted file mode 100644
index 6c7de338556384b0da0864d6add5617a41de3e91..0000000000000000000000000000000000000000
--- a/examples/gmsh.tmp
+++ /dev/null
@@ -1 +0,0 @@
-Plane Surface(28) = {27};