diff --git a/benchmarks/2d/circle2.geo b/benchmarks/2d/circle2.geo
deleted file mode 100644
index 8cd01468281a5e00901e0d008ac97b303a18f6f6..0000000000000000000000000000000000000000
--- a/benchmarks/2d/circle2.geo
+++ /dev/null
@@ -1,27 +0,0 @@
-lc = 0.5;
-
-Point(1) = {0, 0, 0, lc};
-Point(2) = {0, 2, 0, lc};
-Point(3) = {2, 0, 0, lc};
-Point(4) = {0, -2, 0, lc};
-Point(5) = {-2, 0, 0, lc};
-Circle(1) = {2, 1, 5};
-Circle(2) = {5, 1, 4};
-Circle(3) = {4, 1, 3};
-Circle(4) = {3, 1, 2};
-
-Point(22) = {0, 1, 0, lc};
-Point(33) = {1, 0, 0, lc};
-Point(44) = {0, -1, 0, lc};
-Point(55) = {-1, 0, 0, lc};
-Circle(11) = {22, 1, 55};
-Circle(22) = {55, 1, 44};
-Circle(33) = {44, 1, 33};
-Circle(44) = {33, 1, 22};
-
-
-Line Loop(45) = {44, 11, 22, 33};
-Line Loop(46) = {4, 1, 2, 3};
-Plane Surface(47) = {45, 46};
-
-
diff --git a/benchmarks/2d/circle2_GEO.geo b/benchmarks/2d/circle2_GEO.geo
deleted file mode 100644
index 2d493a82fd0275143b127b2bc084df7814ffd4d2..0000000000000000000000000000000000000000
--- a/benchmarks/2d/circle2_GEO.geo
+++ /dev/null
@@ -1,9 +0,0 @@
-Mesh.CharacteristicLengthFactor=0.8;
-
-Merge "circle2.msh";
-CreateTopology;
-
-Compound Line (100) = {1,2,3,4};
-Compound Line (200) = {11,22,33,44};
-
-Compound Surface(1000)={47} Boundary {{1,2,3,4}, {11,22,33,44}};
diff --git a/benchmarks/2d/compound.geo b/benchmarks/2d/compound.geo
index 3f088c26083d74cf856c50fe848515a0b623d360..f1c388e193191aa8d6bbb7568f6b122a0355de80 100644
--- a/benchmarks/2d/compound.geo
+++ b/benchmarks/2d/compound.geo
@@ -23,4 +23,4 @@ Line(15) = {8, 7};
 Line Loop(100) = {13, -14, 15};
 Plane Surface(11) = {10,100};
 
-Compound Surface(-12)={9,11} Boundary {{}};
+Compound Surface(12)={9,11}; 
diff --git a/benchmarks/2d/createTopo.msh b/benchmarks/2d/createTopo.msh
deleted file mode 100644
index 4194b156d74cd74dceabcfd9d7d77a4bca1535a8..0000000000000000000000000000000000000000
--- a/benchmarks/2d/createTopo.msh
+++ /dev/null
@@ -1,155 +0,0 @@
-$MeshFormat
-2 0 8
-$EndMeshFormat
-$Nodes
-58
-1 0 0 0
-2 0 1 0
-3 1 1 0
-4 1 0 0
-5 0 2 0
-6 1 2 0
-7 0.2499999999993998 1 0
-8 0.4999999999990217 1 0
-9 0.7499999999993374 1 0
-10 1 0.7500000000003469 0
-11 1 0.5000000000013878 0
-12 1 0.2500000000010407 0
-13 0.7500000000003469 0 0
-14 0.5000000000013878 0 0
-15 0.2500000000010407 0 0
-16 0 0.2499999999993998 0
-17 0 0.4999999999990217 0
-18 0 0.7499999999993374 0
-19 1 1.2 0
-20 1 1.4 0
-21 1 1.6 0
-22 1 1.8 0
-23 0.7500000000003469 2 0
-24 0.5000000000013878 2 0
-25 0.2500000000010407 2 0
-26 0 1.8 0
-27 0 1.6 0
-28 0 1.4 0
-29 0 1.2 0
-30 0.4838453815992497 0.7001134502703265 0
-31 0.2137219674263763 0.6255840250137896 0
-32 0.7964751095545822 0.3310225115184635 0
-33 0.6380768712362025 0.1712066244048212 0
-34 0.5423577861200293 0.4221404297864205 0
-35 0.2491174661656623 0.3998685906427588 0
-36 0.3919626856685218 0.1855558909268056 0
-37 0.7968308623417641 0.581754889093215 0
-38 0.8369103961582264 0.1504458271848651 0
-39 0.7631804184148582 0.8313434174180454 0
-40 0.178216030367045 0.1670848963137928 0
-41 0.3874034021894878 0.5516464588425142 0
-42 0.2412612248373413 0.845949579213909 0
-43 0.1892871905708922 1.696788567649282 0
-44 0.8107128094292139 1.303211432350718 0
-45 0.7839370157560627 1.556826873049367 0
-46 0.2169163731573559 1.442796305409011 0
-47 0.3493592037515919 1.834522414336105 0
-48 0.6506407962486326 1.165477585663895 0
-49 0.1625751921142504 1.856404308390023 0
-50 0.8374248078858939 1.143595691609977 0
-51 0.3972615131649327 1.21833029569987 0
-52 0.6036364124391213 1.781243294253888 0
-53 0.6042108386940316 1.374669587758423 0
-54 0.3970642534924195 1.625260488761389 0
-55 0.4340625840563876 1.445368591067763 0
-56 0.5700944140718672 1.552093283630357 0
-57 0.8562622380325885 1.789678361217209 0
-58 0.1440296477202814 1.21018776685148 0
-$EndNodes
-$Elements
-88
-37 2 3 0 10 0 31 17 18
-38 2 3 0 10 0 32 11 12
-39 2 3 0 10 0 34 32 33
-40 2 3 0 10 0 36 14 15
-41 2 3 0 10 0 14 36 33
-42 2 3 0 10 0 33 13 14
-43 2 3 0 10 0 37 10 11
-44 2 3 0 10 0 34 33 36
-45 2 3 0 10 0 35 17 31
-46 2 3 0 10 0 32 37 11
-47 2 3 0 10 0 32 34 37
-48 2 3 0 10 0 37 34 30
-49 2 3 0 10 0 13 38 4
-50 2 3 0 10 0 12 38 32
-51 2 3 0 10 0 38 12 4
-52 2 3 0 10 0 39 9 3
-53 2 3 0 10 0 10 39 3
-54 2 3 0 10 0 33 38 13
-55 2 3 0 10 0 33 32 38
-56 2 3 0 10 0 34 36 35
-57 2 3 0 10 0 39 37 30
-58 2 3 0 10 0 37 39 10
-59 2 3 0 10 0 39 8 9
-60 2 3 0 10 0 30 8 39
-61 2 3 0 10 0 16 40 1
-62 2 3 0 10 0 40 15 1
-63 2 3 0 10 0 36 40 35
-64 2 3 0 10 0 40 36 15
-65 2 3 0 10 0 30 41 31
-66 2 3 0 10 0 35 41 34
-67 2 3 0 10 0 41 35 31
-68 2 3 0 10 0 41 30 34
-69 2 3 0 10 0 35 16 17
-70 2 3 0 10 0 16 35 40
-71 2 3 0 10 0 7 42 2
-72 2 3 0 10 0 18 42 31
-73 2 3 0 10 0 42 18 2
-74 2 3 0 10 0 42 7 8
-75 2 3 0 10 0 30 42 8
-76 2 3 0 10 0 42 30 31
-77 2 3 0 20 0 24 25 47
-78 2 3 0 20 0 8 9 48
-79 2 3 0 20 0 46 43 27
-80 2 3 0 20 0 45 44 20
-81 2 3 0 20 0 20 44 19
-82 2 3 0 20 0 27 43 26
-83 2 3 0 20 0 21 45 20
-84 2 3 0 20 0 28 46 27
-85 2 3 0 20 0 49 5 26
-86 2 3 0 20 0 25 5 49
-87 2 3 0 20 0 9 3 50
-88 2 3 0 20 0 50 3 19
-89 2 3 0 20 0 47 52 24
-90 2 3 0 20 0 48 51 8
-91 2 3 0 20 0 26 43 49
-92 2 3 0 20 0 49 43 47
-93 2 3 0 20 0 47 25 49
-94 2 3 0 20 0 19 44 50
-95 2 3 0 20 0 50 44 48
-96 2 3 0 20 0 48 9 50
-97 2 3 0 20 0 52 23 24
-98 2 3 0 20 0 51 7 8
-99 2 3 0 20 0 53 51 48
-100 2 3 0 20 0 54 52 47
-101 2 3 0 20 0 53 48 44
-102 2 3 0 20 0 44 45 53
-103 2 3 0 20 0 56 53 45
-104 2 3 0 20 0 54 47 43
-105 2 3 0 20 0 43 46 54
-106 2 3 0 20 0 55 54 46
-107 2 3 0 20 0 53 56 55
-108 2 3 0 20 0 56 54 55
-109 2 3 0 20 0 46 51 55
-110 2 3 0 20 0 51 53 55
-111 2 3 0 20 0 45 52 56
-112 2 3 0 20 0 52 54 56
-113 2 3 0 20 0 57 6 23
-114 2 3 0 20 0 22 6 57
-115 2 3 0 20 0 58 2 7
-116 2 3 0 20 0 29 2 58
-117 2 3 0 20 0 57 23 52
-118 2 3 0 20 0 52 45 57
-119 2 3 0 20 0 58 7 51
-120 2 3 0 20 0 51 46 58
-121 2 3 0 20 0 22 57 21
-122 2 3 0 20 0 21 57 45
-123 2 3 0 20 0 29 58 28
-124 2 3 0 20 0 28 58 46
-$EndElements
diff --git a/benchmarks/2d/createTopo_GEO.geo b/benchmarks/2d/createTopo_GEO.geo
deleted file mode 100644
index 27b48e73392d667167385d56d543032ae32a63f6..0000000000000000000000000000000000000000
--- a/benchmarks/2d/createTopo_GEO.geo
+++ /dev/null
@@ -1,11 +0,0 @@
-Mesh.CharacteristicLengthFactor=4;
-
-Merge "createTopo.msh";
-CreateTopology;
-
-//Compound Line(150)={1};
-//Compound Line(160)={2,3,4};
-//Compound Line(170)={5,6,7};
-
-Compound Surface(100)={10} Boundary {{}};
-Compound Surface(200)={20} Boundary {{}};
\ No newline at end of file
diff --git a/benchmarks/2d/square.geo b/benchmarks/2d/square.geo
index 4ef669b84647aa5c773b28f5cc0c6e2212ecfe6f..f71192fde8f4f84386c89297a0f70bc6d6e96103 100644
--- a/benchmarks/2d/square.geo
+++ b/benchmarks/2d/square.geo
@@ -11,5 +11,4 @@ Line(4) = {1, 2};
 Line Loop(5) = {1, 2, 3, 4};
 Plane Surface(10) = {5};
 
-//Compound Surface(-11)={10};
 
diff --git a/benchmarks/2d/square_CLASS_GEO.geo b/benchmarks/2d/square_CLASS_GEO.geo
deleted file mode 100644
index d68ebf5567ffcb2f778dea1f347c12e186de9e79..0000000000000000000000000000000000000000
--- a/benchmarks/2d/square_CLASS_GEO.geo
+++ /dev/null
@@ -1,9 +0,0 @@
-Mesh.CharacteristicLengthFactor=6;
-
-Merge "square.msh";
-CreateTopology;
-
-Compound Line(150)={1,2};
-Compound Line(160)={3,4};
-
-Compound Surface(170)={10} Boundary {{}};
\ No newline at end of file
diff --git a/benchmarks/3d/skull.geo b/benchmarks/stl/skull.geo
similarity index 100%
rename from benchmarks/3d/skull.geo
rename to benchmarks/stl/skull.geo
diff --git a/benchmarks/3d/skullU.stl b/benchmarks/stl/skullU.stl
similarity index 100%
rename from benchmarks/3d/skullU.stl
rename to benchmarks/stl/skullU.stl